From: Mirio <opivy@hotmail.de>
Date: Mon, 31 Aug 2015 11:59:56 +0000 (+0200)
Subject: Merge branch 'master' into justin/erbium
X-Git-Tag: xonotic-v0.8.2~78^2~40
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e152106a22e90e62fac1e5e03ddf1423c1fde169;p=xonotic%2Fxonotic-maps.pk3dir.git

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

e152106a22e90e62fac1e5e03ddf1423c1fde169