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

Merge branch 'Justin/erbium' into 'master'

Justin/erbium

See merge request !30
---

bb23be3218271a28331a58cebb14407da1a80964