From: Mirio <opivy@hotmail.de>
Date: Mon, 6 Apr 2015 16:42:03 +0000 (+0200)
Subject: Merge branch 'master' into maddin/map-warfare
X-Git-Tag: xonotic-v0.8.1~12^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c53b8c9c87efbb192504df053534f88eda8f49fd;p=xonotic%2Fxonotic-maps.pk3dir.git

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

c53b8c9c87efbb192504df053534f88eda8f49fd