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

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

4e8590648ec97b74cad15fdacaedea4cc37412df