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

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

e417eb2b333aa8c1d6c981115a557c348f6376ca