From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 04:52:38 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/kuniuthefrogg/afterslime'
X-Git-Tag: xonotic-v0.7.0~27
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=34f5588335749ec6eb1bc4d622e4078c92b34b6f;p=xonotic%2Fxonotic-maps.pk3dir.git

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

34f5588335749ec6eb1bc4d622e4078c92b34b6f