From: Wolfgang Bumiller <wolfgang.linux@bumiller.com>
Date: Thu, 26 Jul 2012 21:22:53 +0000 (+0200)
Subject: Merge branch 'master' into blub/bc3
X-Git-Tag: 0.1-rc1~396
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=22e6b8558b3b60d9924b802786499ef8d6af671f;p=xonotic%2Fgmqcc.git

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

22e6b8558b3b60d9924b802786499ef8d6af671f