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

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

6759c3633b0d2d18f776d5798af889566d86f00e