From: terencehill <piuntn@gmail.com>
Date: Sun, 14 Dec 2014 22:45:56 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/eventchase
X-Git-Tag: xonotic-v0.8.0~81^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=88e2b104926cf3d356cfdf2cd3598f7d743a1a35;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/eventchase
---

88e2b104926cf3d356cfdf2cd3598f7d743a1a35