From: Samual Lenks <samual@xonotic.org>
Date: Mon, 22 Apr 2013 21:03:50 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/runningman'
X-Git-Tag: xonotic-v0.7.0~51
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=e38eb2393d51ad83f42c2c6604e89fed86cdb0a7

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

e38eb2393d51ad83f42c2c6604e89fed86cdb0a7