From: Mirio <opivy@hotmail.de>
Date: Wed, 20 Jan 2016 08:58:50 +0000 (+0100)
Subject: Merge branch 'master' into Mirio/darkzone
X-Git-Tag: xonotic-v0.8.2~101^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=42ec9eb1f648eeb39d6cf1172848013f594e26e5;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into Mirio/darkzone
---

42ec9eb1f648eeb39d6cf1172848013f594e26e5