From: Mirio <opivy@hotmail.de>
Date: Mon, 27 Mar 2017 15:36:09 +0000 (+0000)
Subject: Merge branch 'matthiaskrgr/afterslime' into 'master'
X-Git-Tag: xonotic-v0.8.2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ff4d4ff7296f1d1b3493f94accef0b15379d37d2;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'matthiaskrgr/afterslime' into 'master'

Matthiaskrgr/afterslime

See merge request !98
---

ff4d4ff7296f1d1b3493f94accef0b15379d37d2