From: Wolfgang Bumiller <blub@speed.at>
Date: Tue, 12 Feb 2013 13:31:27 +0000 (+0100)
Subject: Merge branch 'master' into cooking
X-Git-Tag: before-library~112
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=3593a1b6b89ff690b8e89a31707468aad014b7b1

Merge branch 'master' into cooking
---

3593a1b6b89ff690b8e89a31707468aad014b7b1