From: Dale Weiler <killfieldengine@gmail.com>
Date: Sun, 8 Sep 2013 17:05:20 +0000 (-0400)
Subject: Merge branch 'master' into cooking
X-Git-Tag: 0.3.5~102
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2cf41baf95c7a45789e4c73202928baf9e9b650;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

c2cf41baf95c7a45789e4c73202928baf9e9b650