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

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

b22a76a15226df4679409f00a37af715d0d157ae