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

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

ae251d391464763fd8293efd65627f9f9fd56572