Merge remote-tracking branch 'origin/Mirio/mapoptions'
authorSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 22:37:55 +0000 (18:37 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 3 Jun 2013 22:37:55 +0000 (18:37 -0400)

Trivial merge