From: Dale Weiler <killfieldengine@gmail.com>
Date: Thu, 31 Oct 2013 12:22:54 +0000 (-0400)
Subject: Merge branch 'cooking'
X-Git-Tag: 0.3.5~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d745fd1f9b0448a00140cef0b68d9a3aa73f1f1;p=xonotic%2Fgmqcc.git

Merge branch 'cooking'
---

1d745fd1f9b0448a00140cef0b68d9a3aa73f1f1