From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Sat, 27 Apr 2013 14:55:28 +0000 (+0200)
Subject: Merge branch 'master' into cooking
X-Git-Tag: v0.3.0~151^2~62
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ace0811ce3eaf8a7a62664a4a6ed483a6c00a67;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

9ace0811ce3eaf8a7a62664a4a6ed483a6c00a67