Merge 0.10->trunk

This commit is contained in:
Kim Alvefur 2016-02-18 15:00:17 +01:00
commit 03bec1a290
3 changed files with 5 additions and 3 deletions

View file

@ -23,7 +23,7 @@ local ipairs, pairs, select = ipairs, pairs, select;
local tonumber, tostring = tonumber, tostring;
local require = require;
local pack = table.pack or function(...) return {n=select("#",...), ...}; end -- table.pack is only in 5.2
local unpack = table.unpack or unpack; -- renamed in 5.2
local unpack = table.unpack or unpack; --luacheck: ignore 113 -- renamed in 5.2
local prosody = prosody;
local hosts = prosody.hosts;