From: Dale Weiler <killfieldengine@gmail.com>
Date: Wed, 2 May 2012 19:50:50 +0000 (-0400)
Subject: Merge branch 'master' into ast-and-ir
X-Git-Tag: 0.1-rc1~514
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5a1cc405af354c94d77a42d0e621295bbd71bce4;p=xonotic%2Fgmqcc.git

Merge branch 'master' into ast-and-ir
---

5a1cc405af354c94d77a42d0e621295bbd71bce4