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