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

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

3d21db9896a497e0f978a8586aa943a7a3ca427d