From: Samual Lenks Date: Thu, 10 Oct 2013 17:25:17 +0000 (-0400) Subject: Merge branch 'samual/serverlist' of http://nl.git.xonotic.org/xonotic/xonotic-data... X-Git-Tag: xonotic-v0.8.0~256^2~36 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4425f674fd5ba95b8102e5bb92eec1ec3f5e637b;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'samual/serverlist' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/serverlist --- 4425f674fd5ba95b8102e5bb92eec1ec3f5e637b