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

Merge branch 'master' into cooking
---

f6792c3a05cb1ac31be5a2eb717878b40c78ecc4