From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Sat, 27 Apr 2013 15:52:54 +0000 (+0200)
Subject: Merge branch 'master' into cooking
X-Git-Tag: v0.3.0~151^2~58^2~1
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=2058ce69a4b4e0d380aa3eb5ad4e08a9a4df7368

Merge branch 'master' into cooking
---

2058ce69a4b4e0d380aa3eb5ad4e08a9a4df7368