Merge branch 'samual/runningman_separate' of git://de.git.xonotic.org/xonotic/xonotic...
authorFruitieX <fruitiex@gmail.com>
Thu, 14 Feb 2013 22:10:14 +0000 (00:10 +0200)
committerFruitieX <fruitiex@gmail.com>
Thu, 14 Feb 2013 22:10:14 +0000 (00:10 +0200)

Trivial merge