From: Mirio <opivy@hotmail.de>
Date: Wed, 26 Oct 2016 00:35:25 +0000 (+0200)
Subject: Merge branch 'master' into justin/erbium
X-Git-Tag: xonotic-v0.8.2~78^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eb6a11086b98e7f1ef7948cf0a83eb0c7d110e2d;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into justin/erbium
---

eb6a11086b98e7f1ef7948cf0a83eb0c7d110e2d