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

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

2bfd27271444c99d02ac8de3135c6a7981b18286