From: Wolfgang Bumiller <wry.git@bumiller.com>
Date: Mon, 7 Apr 2014 12:23:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into cooking
X-Git-Tag: xonotic-v0.8.0~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8133893a0bd4e1cc469864b3d6f621ed5f3186f;p=xonotic%2Fgmqcc.git

Merge remote-tracking branch 'origin/master' into cooking
---

e8133893a0bd4e1cc469864b3d6f621ed5f3186f