From: Wolfgang Bumiller <blub@speed.at>
Date: Sun, 21 Apr 2013 10:37:06 +0000 (+0200)
Subject: Merge branch 'master' into cooking
X-Git-Tag: before-library~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=685fa54daf0b3fdd92d9424e7fcab1ded9fb3c29;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

685fa54daf0b3fdd92d9424e7fcab1ded9fb3c29