From: Wolfgang Bumiller <wolfgang.linux@bumiller.com>
Date: Sat, 28 Jul 2012 19:04:59 +0000 (+0200)
Subject: Merge branch 'master' into cmdline
X-Git-Tag: 0.1-rc1~366^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a7957a9fdc6baf3eaa7f62fc00e1a50a23ffa634;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cmdline
---

a7957a9fdc6baf3eaa7f62fc00e1a50a23ffa634