From: Mirio <opivy@hotmail.de>
Date: Tue, 31 Jan 2017 12:56:22 +0000 (+0100)
Subject: Merge branch 'master' into Justin/erbium
X-Git-Tag: xonotic-v0.8.2~78^2~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f64ad4f66863c517acffa796ea6fc85e885c434f;p=xonotic%2Fxonotic-maps.pk3dir.git

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

f64ad4f66863c517acffa796ea6fc85e885c434f