From: Mirio <opivy@hotmail.de>
Date: Mon, 13 Mar 2017 16:02:58 +0000 (+0100)
Subject: Merge branch 'master' into matthiaskrgr/SE
X-Git-Tag: xonotic-v0.8.2~59^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0362e059455f88b5ed71f1fecdd0fdc618ea8de;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into matthiaskrgr/SE
---

c0362e059455f88b5ed71f1fecdd0fdc618ea8de