From: Wolfgang Bumiller <wolfgang.linux@bumiller.com>
Date: Thu, 19 Jul 2012 16:06:56 +0000 (+0200)
Subject: Merge branch 'master' into blub/bc3
X-Git-Tag: 0.1-rc1~426
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09fa41318de29930b9c0f909d76d66a7317414fe;p=xonotic%2Fgmqcc.git

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

09fa41318de29930b9c0f909d76d66a7317414fe