From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Sun, 12 Aug 2012 09:39:52 +0000 (+0200)
Subject: Merge branch 'master' into blub/parser
X-Git-Tag: 0.1-rc1~345
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=067294a470beb5479c97a3ac9e5147691e6013a8;p=xonotic%2Fgmqcc.git

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

067294a470beb5479c97a3ac9e5147691e6013a8