From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Sun, 12 Aug 2012 09:36:41 +0000 (+0200)
Subject: Merge branch 'master' into blub/bc3
X-Git-Tag: 0.1-rc1~346
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2f13ebc5e61a268ba40e7bb58084913b19f2927;p=xonotic%2Fgmqcc.git

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

b2f13ebc5e61a268ba40e7bb58084913b19f2927