From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Sun, 26 Jan 2014 11:38:00 +0000 (+0100)
Subject: Merge branch 'master' into cooking
X-Git-Tag: xonotic-v0.8.0~14
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=9cc4fe1ed246e3c37af7cbd7245b0b413372f3b9;hp=9cc4fe1ed246e3c37af7cbd7245b0b413372f3b9

Merge branch 'master' into cooking
---