From: Samual Lenks Date: Fri, 27 Dec 2013 08:20:57 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into Mario/quickmenu_merge X-Git-Tag: xonotic-v0.8.2~1987^2~55^2^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=835d97fedc132c34cd035c763c4750ed49aa44a0;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into Mario/quickmenu_merge --- 835d97fedc132c34cd035c763c4750ed49aa44a0