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

Merge branch 'master' into cooking
---

18cf3641b1e18a8c7ae36d8f9dd770fb48c191c4