From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Sun, 12 Aug 2012 09:28:52 +0000 (+0200)
Subject: merging master
X-Git-Tag: 0.1-rc1~348
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=647582aeb4a36a0a71e3426896aeb195308b4d88;p=xonotic%2Fgmqcc.git

merging master
---

647582aeb4a36a0a71e3426896aeb195308b4d88