From: Samual Lenks Date: Thu, 24 Oct 2013 18:38:57 +0000 (-0400) Subject: Merge branch 'samual/serverlist' into samual/combined_updates X-Git-Tag: xonotic-v0.8.0~139^2~1^2~125 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3be8564ecb6ae5fa049970ee5e6bff90685bf57c;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'samual/serverlist' into samual/combined_updates --- 3be8564ecb6ae5fa049970ee5e6bff90685bf57c