From: Mirio <opivy@hotmail.de>
Date: Wed, 15 Apr 2015 23:32:53 +0000 (+0200)
Subject: Merge branch 'master' into amade/finalrage
X-Git-Tag: xonotic-v0.8.1~7^2~4
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e552af4d0119781a6eb6eca3fed04c15713b4dd9;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into amade/finalrage
---

e552af4d0119781a6eb6eca3fed04c15713b4dd9