From: Mirio <opivy@hotmail.de>
Date: Wed, 26 Oct 2016 22:38:09 +0000 (+0200)
Subject: Merge branch 'maddin/map-warfare-updates'
X-Git-Tag: xonotic-v0.8.2~130
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4f647451703feaa22b9329738d1463c1bd0861b;p=xonotic%2Fxonotic-maps.pk3dir.git

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

d4f647451703feaa22b9329738d1463c1bd0861b