From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sat, 24 Jul 2010 19:32:59 +0000 (+0300)
Subject: Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir... 
X-Git-Tag: xonotic-v0.5.0~129^2~69
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=6dc45502087cc70043979d9e22aeb610caeb4e07

Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir into fruitiex/runningmanctf
---

6dc45502087cc70043979d9e22aeb610caeb4e07