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)
commit3be8564ecb6ae5fa049970ee5e6bff90685bf57c
treeae901a0a9411578614c8815cd1b69edac5bf23eb
parent84d5dd421b95629e09f1a8499cb7f3b5f8041412
parentbc20da5a3271b337049a25f68ddecad472b8db98
Merge branch 'samual/serverlist' into samual/combined_updates