From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Sat, 8 Feb 2014 09:33:50 +0000 (+0100)
Subject: Merge branch 'master' into cooking
X-Git-Tag: xonotic-v0.8.0~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f7e074d88fb8ff2c9722187292341e6a692f3649;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

f7e074d88fb8ff2c9722187292341e6a692f3649