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

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

cda67c2632f5c6272cdf418bfba8335d6bfd784f