From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Sat, 11 Aug 2012 09:32:12 +0000 (+0200)
Subject: Merge branch 'master' into blub/bc3
X-Git-Tag: 0.1-rc1~353
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cbaf9095ceba90ce478dbbf6070089ee8b14b308;p=xonotic%2Fgmqcc.git

Merge branch 'master' into blub/bc3
---

cbaf9095ceba90ce478dbbf6070089ee8b14b308