From: Dale Weiler <killfieldengine@gmail.com>
Date: Sun, 21 Apr 2013 10:09:08 +0000 (+0000)
Subject: Merge branch 'cooking'
X-Git-Tag: before-library~26^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=462c06d56bfab0e0c430e3910d9fcba88cca19da;p=xonotic%2Fgmqcc.git

Merge branch 'cooking'
---

462c06d56bfab0e0c430e3910d9fcba88cca19da