From: Mario <zacjardine@y7mail.com>
Date: Tue, 2 Dec 2014 02:29:39 +0000 (+1100)
Subject: Merge branch 'Mario/catharsis'
X-Git-Tag: xonotic-v0.8.0~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c99fd1362e02ac5d2f70b75aeb3c4f6138e909d2;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mario/catharsis'
---

c99fd1362e02ac5d2f70b75aeb3c4f6138e909d2