From: FruitieX <rasse@rasse-laptop.(none)>
Date: Sat, 2 Oct 2010 21:05:22 +0000 (+0300)
Subject: Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir... 
X-Git-Tag: xonotic-v0.5.0~129^2~56
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1b6f676bab578eb0c2a36e1911a8bcc880b040b4;p=xonotic%2Fxonotic-maps.pk3dir.git

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

Conflicts:
	maps/runningmanctf.map
---

1b6f676bab578eb0c2a36e1911a8bcc880b040b4