From: terencehill Date: Tue, 21 Jan 2014 00:26:17 +0000 (+0100) Subject: Merge branch 'master' into terencehill/quickmenu_UPDATE X-Git-Tag: xonotic-v0.8.2~1987^2~47 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20dab29dead5d1060ed27d11b7a7dc1ff42ab1b4;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/quickmenu_UPDATE --- 20dab29dead5d1060ed27d11b7a7dc1ff42ab1b4