From: Dale Weiler <killfieldengine@gmail.com>
Date: Fri, 4 Jan 2013 11:56:07 +0000 (+0000)
Subject: Merge branch 'correct'
X-Git-Tag: before-library~373
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2d96b2a3ecb3610493c261c297da8a0ed429cd15;p=xonotic%2Fgmqcc.git

Merge branch 'correct'
---

2d96b2a3ecb3610493c261c297da8a0ed429cd15