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

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

e48aca1ab3ac240de086606572ad788b4685382f