--- a/core/moduleapi.lua	Wed Nov 06 12:56:35 2013 -0500
+++ b/core/moduleapi.lua	Wed Nov 06 14:38:51 2013 -0500
@@ -16,8 +16,10 @@
 
 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
 local error, setmetatable, type = error, setmetatable, type;
-local ipairs, pairs, select, unpack = ipairs, pairs, select, unpack;
+local ipairs, pairs, select = ipairs, pairs, select;
 local tonumber, tostring = tonumber, tostring;
+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 prosody = prosody;
 local hosts = prosody.hosts;
@@ -364,7 +366,6 @@
 	return t.callback(now, unpack(t, 1, t.n));
 end
 
-local pack = table.pack or function(...) return {n=select("#",...), ...}; end
 function api:add_timer(delay, callback, ...)
 	local t = pack(...)
 	t.module_env = self;