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

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

a3919a6074d3182416a03d3cb0fcd9461d3cb37e