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

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

ea09553b322d3b788c07043291ae532afa9cba99