From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Fri, 10 Aug 2012 18:48:42 +0000 (+0200)
Subject: Merge branch 'master' into blub/bc3
X-Git-Tag: 0.1-rc1~358
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=55743936d9ed9538051f5a13b3e863a1f66d4f17;p=xonotic%2Fgmqcc.git

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

55743936d9ed9538051f5a13b3e863a1f66d4f17