From: Mirio <opivy@hotmail.de>
Date: Fri, 3 Mar 2017 23:04:39 +0000 (+0000)
Subject: Merge branch 't0uYK8Ne/afterslime' into 'master'
X-Git-Tag: xonotic-v0.8.2~96
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3b259070c9ef619b5e923f937b556e6bc5c3c51c;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 't0uYK8Ne/afterslime' into 'master'

t0uYK8Ne/afterslime

Closes #120

See merge request !64
---

3b259070c9ef619b5e923f937b556e6bc5c3c51c