From: Mirio <opivy@hotmail.de>
Date: Thu, 9 Jul 2015 19:04:04 +0000 (+0200)
Subject: Merge branch 'maddin/map-warfare'
X-Git-Tag: xonotic-v0.8.1~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48c944b8b62976ffb79b566f40dae12f161bc28c;p=xonotic%2Fxonotic-maps.pk3dir.git

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

48c944b8b62976ffb79b566f40dae12f161bc28c