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

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

78ca4afa0679fccd39736279329cf43da7ae3d48