From: Mirio <opivy@hotmail.de>
Date: Wed, 20 Jan 2016 09:00:38 +0000 (+0100)
Subject: Merge branch 'master' into Justin/erbium
X-Git-Tag: xonotic-v0.8.2~78^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d81560387df8bd7038a43522e0f49934f9e47c8;p=xonotic%2Fxonotic-maps.pk3dir.git

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

1d81560387df8bd7038a43522e0f49934f9e47c8