From: Samual Lenks Date: Thu, 24 Oct 2013 18:11:06 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/serverlist X-Git-Tag: xonotic-v0.8.0~256^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc20da5a3271b337049a25f68ddecad472b8db98;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/serverlist --- bc20da5a3271b337049a25f68ddecad472b8db98