From: Mirio <opivy@hotmail.de>
Date: Mon, 16 Mar 2015 14:19:54 +0000 (+0100)
Subject: Merge branch 'master' into amade/finalrage
X-Git-Tag: xonotic-v0.8.1~7^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f3a36304fc9bc7dd9a0d07172c446476b903ad0e;p=xonotic%2Fxonotic-maps.pk3dir.git

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

f3a36304fc9bc7dd9a0d07172c446476b903ad0e