From: Wolfgang Bumiller <blub@speed.at>
Date: Sun, 3 Feb 2013 18:01:30 +0000 (+0100)
Subject: Merge branch 'master' into cooking
X-Git-Tag: before-library~165
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c41ef65cc92193e9b685cc123ca9d4de9d142756;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

c41ef65cc92193e9b685cc123ca9d4de9d142756