From: Samual Lenks Date: Sun, 30 Dec 2012 16:16:46 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/Mario/vote_mapchange_fix' X-Git-Tag: xonotic-v0.7.0~155 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=422598d25417b60689d7e931827e089771832601;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/Mario/vote_mapchange_fix' --- 422598d25417b60689d7e931827e089771832601