From: Samual Lenks Date: Sat, 12 Oct 2013 01:57:00 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/serverlist X-Git-Tag: xonotic-v0.8.0~256^2~16 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6b525e70980c724bf2b072e0f0d1e70617a17662;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/serverlist --- 6b525e70980c724bf2b072e0f0d1e70617a17662