From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 03:33:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/cortez-darkzone-updates'
X-Git-Tag: xonotic-v0.7.0~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72125b3d9080094f540e5cce7a37e2daa3759426;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/samual/cortez-darkzone-updates'

Conflicts:
	maps/darkzone.map
	maps/darkzone.map.options
---

72125b3d9080094f540e5cce7a37e2daa3759426