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

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

44d5e198a105fffce5b08587cc297d08a53caa41