From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Mon, 30 Sep 2013 13:02:03 +0000 (+0200)
Subject: Merge branch 'master' into cooking
X-Git-Tag: 0.3.5~56^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa14ca93d2b60f722d55c24214fde7ac84581ad0;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

fa14ca93d2b60f722d55c24214fde7ac84581ad0