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

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

5ce4ce595962d1e94bbbb2fff7f63b34393d613b