From: Mirio <opivy@hotmail.de>
Date: Tue, 25 Oct 2016 22:29:23 +0000 (+0200)
Subject: Merge branch 'master' into maddin/map-warfare-updates
X-Git-Tag: xonotic-v0.8.2~130^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=60078c4e316512929f4f7d04d59a4ba10725415a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into maddin/map-warfare-updates
---

60078c4e316512929f4f7d04d59a4ba10725415a