From: Dale Weiler <killfieldengine@gmail.com>
Date: Fri, 11 Oct 2013 12:04:02 +0000 (-0400)
Subject: Merge branch 'cleanup' into cooking
X-Git-Tag: 0.3.5~35^2~2
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=92c0d6157c3d6b24ffff811a989572e2ae6d92f9;p=xonotic%2Fgmqcc.git

Merge branch 'cleanup' into cooking
---

92c0d6157c3d6b24ffff811a989572e2ae6d92f9