From: Mirio <opivy@hotmail.de>
Date: Mon, 6 Mar 2017 21:28:55 +0000 (+0100)
Subject: Merge branch 'master' into justin/erbium
X-Git-Tag: xonotic-v0.8.2~78^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e995e63c78e920612bb3437d5b08b53bbd437a16;p=xonotic%2Fxonotic-maps.pk3dir.git

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

e995e63c78e920612bb3437d5b08b53bbd437a16