From: Mirio <opivy@hotmail.de>
Date: Tue, 5 May 2015 12:22:06 +0000 (+0200)
Subject: Merge branch 'master' into amade/finalrage
X-Git-Tag: xonotic-v0.8.1~7^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=55ea98f8f6441cd3b212dd55469bb8f2c9382f84;p=xonotic%2Fxonotic-maps.pk3dir.git

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

55ea98f8f6441cd3b212dd55469bb8f2c9382f84