From: Wolfgang Bumiller <blub@speed.at>
Date: Wed, 20 Feb 2013 22:08:58 +0000 (+0100)
Subject: Merge branch 'master' into cooking
X-Git-Tag: before-library~110
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=d27c06ea7fb9f55ea4014851af2b219732b657ef

Merge branch 'master' into cooking
---

d27c06ea7fb9f55ea4014851af2b219732b657ef