From: Mirio <opivy@hotmail.de>
Date: Tue, 25 Oct 2016 22:32:48 +0000 (+0200)
Subject: Merge branch 'master' into Mirio/darkzone
X-Git-Tag: xonotic-v0.8.2~101^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=689828122745aa334af89ffc57f8136e9edcbf9e;p=xonotic%2Fxonotic-maps.pk3dir.git

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

689828122745aa334af89ffc57f8136e9edcbf9e