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

Merge branch 'master' into cooking
---

9f2b9e1b46c583d12796df8741bd9b448397b8cb