From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 28 Dec 2010 10:18:25 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/runningmanctf'
X-Git-Tag: xonotic-v0.5.0~129
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=4474349194d521815a7395714f9e5ffe5e7facd9;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/fruitiex/runningmanctf'
---

4474349194d521815a7395714f9e5ffe5e7facd9