From: Samual Lenks <samual@xonotic.org>
Date: Tue, 4 Jun 2013 16:12:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/runningmanctf'
X-Git-Tag: xonotic-v0.7.0~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8d0ae82f78abc431159a4886ae55097eaa06b521;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/runningmanctf'
---

8d0ae82f78abc431159a4886ae55097eaa06b521