From: Wolfgang Bumiller <blub@speed.at>
Date: Fri, 25 Jan 2013 15:03:38 +0000 (+0100)
Subject: Merge branch 'master' into cooking
X-Git-Tag: before-library~222
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31f0c05ebc256ac16a9859b59767cbe1d55fb06d;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

31f0c05ebc256ac16a9859b59767cbe1d55fb06d