From: Mirio <opivy@hotmail.de>
Date: Mon, 30 Jan 2017 17:43:05 +0000 (+0000)
Subject: Merge branch 'catharsis-cleanup' into 'master'
X-Git-Tag: xonotic-v0.8.2~114
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0c3ee0747bf1c8ef9c1fc9b0a8e352700ff5a18;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'catharsis-cleanup' into 'master'

Catharsis cleanup

See merge request !59
---

c0c3ee0747bf1c8ef9c1fc9b0a8e352700ff5a18