From: Mirio <opivy@hotmail.de>
Date: Tue, 25 Oct 2016 22:34:40 +0000 (+0200)
Subject: Merge branch 'master' into packer/vorix
X-Git-Tag: xonotic-v0.8.2~131^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=f210999ed25e066ccdb029f2eec8c4012d690a9d

Merge branch 'master' into packer/vorix
---

f210999ed25e066ccdb029f2eec8c4012d690a9d