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

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

aef49d966729acec5bd76fd72e42ff0950b7f3c8