From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Sat, 11 Aug 2012 09:46:59 +0000 (+0200)
Subject: Merge branch 'master' into blub/bc3
X-Git-Tag: 0.1-rc1~352
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=c1e305088e80447811ff54b978d5aef65d4b164e

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

c1e305088e80447811ff54b978d5aef65d4b164e