From: FruitieX <fruitiex@gmail.com>
Date: Thu, 14 Feb 2013 22:10:14 +0000 (+0200)
Subject: Merge branch 'samual/runningman_separate' of git://de.git.xonotic.org/xonotic/xonotic... 
X-Git-Tag: xonotic-v0.7.0~25^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6f4dedf2218074917fc4b13ab779d4eded497a2b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'samual/runningman_separate' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into samual/runningman_separate
---

6f4dedf2218074917fc4b13ab779d4eded497a2b