From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Sat, 24 May 2014 15:13:05 +0000 (+0200)
Subject: Merge branch 'master' into cooking
X-Git-Tag: xonotic-v0.8.1~9^2~33^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7b60e74683ec62eb62e461f757448b3f1a78744;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

b7b60e74683ec62eb62e461f757448b3f1a78744