From: Dale Weiler <killfieldengine@gmail.com>
Date: Mon, 22 Apr 2013 00:11:31 +0000 (+0000)
Subject: Merge branch 'master' into cooking
X-Git-Tag: before-library~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1759388e3fc948e5f2ddb15da601c4d624618828;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

1759388e3fc948e5f2ddb15da601c4d624618828