From: Mirio <opivy@hotmail.de>
Date: Wed, 9 Mar 2016 17:12:50 +0000 (+0100)
Subject: Merge branch 'master' into justin/erbium
X-Git-Tag: xonotic-v0.8.2~78^2~31
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=473559d9e5f6e35fcbe088daa54be0f5f2f997e0;p=xonotic%2Fxonotic-maps.pk3dir.git

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

473559d9e5f6e35fcbe088daa54be0f5f2f997e0