Merge remote-tracking branch 'origin/master' into samual/serverlist
authorSamual Lenks <samual@xonotic.org>
Sun, 6 Oct 2013 21:23:50 +0000 (17:23 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 6 Oct 2013 21:23:50 +0000 (17:23 -0400)
1  2 
qcsrc/menu/xonotic/serverlist.c

Simple merge