From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Fri, 11 Oct 2013 12:10:57 +0000 (+0200)
Subject: Merge branch 'cooking' of git://github.com/graphitemaster/gmqcc into cooking
X-Git-Tag: 0.3.5~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=82afdb1e2cc2b9171ac79ef45b1d3743c590f0ec;p=xonotic%2Fgmqcc.git

Merge branch 'cooking' of git://github.com/graphitemaster/gmqcc into cooking
---

82afdb1e2cc2b9171ac79ef45b1d3743c590f0ec