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

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

c5d3e5eb31fc7b4f0ee1b504b92534d3463c7a28