From: Samual Lenks <samual@xonotic.org>
Date: Mon, 3 Jun 2013 17:22:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/runningmanctf'
X-Git-Tag: xonotic-v0.7.0~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6d428f96a06e90191eeb9a468279595c6802d14;p=xonotic%2Fxonotic-maps.pk3dir.git

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

a6d428f96a06e90191eeb9a468279595c6802d14