From: Samual Lenks Date: Sun, 6 Oct 2013 21:23:50 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/serverlist X-Git-Tag: xonotic-v0.8.0~256^2~66 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49af10f3413b96e52055359d42288dbf5ec6972b;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/serverlist --- 49af10f3413b96e52055359d42288dbf5ec6972b