Merge remote-tracking branch 'origin/terencehill/mapvote_cursor_fix'
authorSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 21:13:07 +0000 (17:13 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 21:13:07 +0000 (17:13 -0400)

Trivial merge