From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Sat, 17 Nov 2012 10:34:00 +0000 (+0100)
Subject: Merge branch 'master' into ftepp
X-Git-Tag: 0.1.9~404^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79abe3fb6d9cf6c0d5f234d64fd77181b2c2317d;p=xonotic%2Fgmqcc.git

Merge branch 'master' into ftepp
---

79abe3fb6d9cf6c0d5f234d64fd77181b2c2317d