From: Rudolf Polzer <divverent@xonotic.org>
Date: Wed, 29 Feb 2012 09:46:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/cbrutail/darkzone'
X-Git-Tag: xonotic-v0.6.0~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f95d78a37404b4e0666d36dcc71ffdd974d3534;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/cbrutail/darkzone'
---

0f95d78a37404b4e0666d36dcc71ffdd974d3534