From: Mirio <opivy@hotmail.de>
Date: Wed, 26 Oct 2016 23:22:13 +0000 (+0200)
Subject: Merge branch 'master' into justin/erbium
X-Git-Tag: xonotic-v0.8.2~78^2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2a096a4ba21767db90ff3a48611ab2b5e69124e4;p=xonotic%2Fxonotic-maps.pk3dir.git

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

2a096a4ba21767db90ff3a48611ab2b5e69124e4