From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Wed, 15 Aug 2012 10:11:45 +0000 (+0200)
Subject: Merge branch 'master' of git://github.com/graphitemaster/gmqcc
X-Git-Tag: 0.1-rc1~277
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=5b4c7a67a7be71e070f73a88e9ee83743b7472ca;p=xonotic%2Fgmqcc.git

Merge branch 'master' of git://github.com/graphitemaster/gmqcc
---

5b4c7a67a7be71e070f73a88e9ee83743b7472ca