From: Mirio <opivy@hotmail.de>
Date: Fri, 10 Mar 2017 13:58:44 +0000 (+0100)
Subject: Merge branch 'master' into Justin/erbium
X-Git-Tag: xonotic-v0.8.2~78^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=82108e9d4c3f6a252952fe3f3c22a466ac504ad7;p=xonotic%2Fxonotic-maps.pk3dir.git

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

82108e9d4c3f6a252952fe3f3c22a466ac504ad7