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

Merge branch 'master' into cooking
---

1dce501b7058000e19421af246ec14fd98aceab9