From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Sun, 18 Nov 2012 12:06:29 +0000 (+0100)
Subject: Merge branch 'master' into ftepp
X-Git-Tag: 0.1.9~404^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f0d56d07fe2801f04ef6a9ca92587d54c0cbd72d;p=xonotic%2Fgmqcc.git

Merge branch 'master' into ftepp
---

f0d56d07fe2801f04ef6a9ca92587d54c0cbd72d