From: terencehill Date: Mon, 6 Jan 2014 01:00:59 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/Mario/quickmenu_merge' into terencehill/quickmen... X-Git-Tag: xonotic-v0.8.2~1987^2~55 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2755abdfb4cb55785be0e78db99bf2c30c1e297f;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/Mario/quickmenu_merge' into terencehill/quickmenu_UPDATE --- 2755abdfb4cb55785be0e78db99bf2c30c1e297f