From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Wed, 17 Apr 2013 16:24:04 +0000 (+0200)
Subject: Merge branch 'cooking' into threading
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ae1dc2ef1f1088cdcc6cda009286507e0a93621;p=xonotic%2Fgmqcc.git

Merge branch 'cooking' into threading
---

7ae1dc2ef1f1088cdcc6cda009286507e0a93621