From: Mirio <opivy@hotmail.de>
Date: Sun, 25 Dec 2016 13:42:41 +0000 (+0100)
Subject: Merge branch 'master' into Mirio/dance
X-Git-Tag: xonotic-v0.8.2~95^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e26c4f7e0674da137253476d681dfffe85afd122;p=xonotic%2Fxonotic-maps.pk3dir.git

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

e26c4f7e0674da137253476d681dfffe85afd122