From: Mirio <opivy@hotmail.de>
Date: Fri, 17 Mar 2017 22:44:48 +0000 (+0000)
Subject: Merge branch 't0uYK8Ne/catharsis' into 'master'
X-Git-Tag: xonotic-v0.8.2~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dbd017299832eddb275856eb15b36b8875f2cbce;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 't0uYK8Ne/catharsis' into 'master'

catharsis: fix various issues

See merge request !88
---

dbd017299832eddb275856eb15b36b8875f2cbce