Merge branch 'samual/serverlist' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Thu, 24 Oct 2013 18:38:57 +0000 (14:38 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 24 Oct 2013 18:38:57 +0000 (14:38 -0400)

Trivial merge