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

Merge branch 'master' into cooking
---

934ff4a5eb5ee0d2a2de1f9a0d313d7f4bccb4c6