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

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

0a1d4da591828f114f5a527a2d885a790f4a2df0