From: Samual Lenks <samual@xonotic.org>
Date: Mon, 3 Jun 2013 17:18:56 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/afterslime'
X-Git-Tag: xonotic-v0.7.0~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6592656395c02865768962a0eeb4e20f4b40d703;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/afterslime'
---

6592656395c02865768962a0eeb4e20f4b40d703