From: Mirio <opivy@hotmail.de>
Date: Mon, 6 Apr 2015 16:38:28 +0000 (+0200)
Subject: Merge branch 'master' into amade/finalrage
X-Git-Tag: xonotic-v0.8.1~7^2~8
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=6810dd4e2dce6ae37dbd790bd953900d67798f9a

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

6810dd4e2dce6ae37dbd790bd953900d67798f9a