From: Wolfgang Bumiller <wolfgang.linux@bumiller.com>
Date: Fri, 27 Jul 2012 11:40:34 +0000 (+0200)
Subject: Merge branch 'master' into blub/bc3
X-Git-Tag: 0.1-rc1~384
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f103544c95f7bda51446ab5f34d15a84fbf3d1bb;p=xonotic%2Fgmqcc.git

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

f103544c95f7bda51446ab5f34d15a84fbf3d1bb