From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Wed, 8 Aug 2012 10:25:31 +0000 (+0200)
Subject: Merge branch 'master' into blub/bc3
X-Git-Tag: 0.1-rc1~361
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0bee75940616ea487cf52d1ea82c9f7a90c8d4e6;p=xonotic%2Fgmqcc.git

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

0bee75940616ea487cf52d1ea82c9f7a90c8d4e6