From: Mirio <opivy@hotmail.de>
Date: Sun, 6 Sep 2015 18:06:20 +0000 (+0000)
Subject: Merge branch 'Mirio/catharsis' into 'master'
X-Git-Tag: xonotic-v0.8.2~176
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c81a22e1f4ce5ac3fe2af503273cf4e387a09484;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/catharsis' into 'master'

Mirio/catharsis

Fixes #101

See merge request !35
---

c81a22e1f4ce5ac3fe2af503273cf4e387a09484