Merge remote-tracking branch 'origin/Mario/vote_mapchange_fix'
authorSamual Lenks <samual@xonotic.org>
Sun, 30 Dec 2012 16:16:46 +0000 (11:16 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 30 Dec 2012 16:16:46 +0000 (11:16 -0500)
commit422598d25417b60689d7e931827e089771832601
treefbd9732540f402211b7bc33911eb4b910ef28765
parentc7cba556c17ef6243f4e56111161876035760652
parent2c0404c7bc82b2c11454b08a9ed9070c1a6b6a9c
Merge remote-tracking branch 'origin/Mario/vote_mapchange_fix'