aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-07-28 09:39:50 +0100
committerMatthew Wild <mwild1@gmail.com>2016-07-28 09:39:50 +0100
commit49d78800587641b15e66962f2740d501c1169a08 (patch)
treec1767a4b6577725fbe5586acab5a2453c18b373a /net
parent52717fc086cb6453c0a5341c0cdc2d0cdba18b83 (diff)
parent81e867eb41ec5131cd0725a17f2b4faa8dfe33b2 (diff)
downloadprosody-49d78800587641b15e66962f2740d501c1169a08.tar.gz
prosody-49d78800587641b15e66962f2740d501c1169a08.zip
Merge 0.10 -> trunk
Diffstat (limited to 'net')
-rw-r--r--net/dns.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 7bdb9e57..232e9e7c 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -22,8 +22,8 @@ local is_windows = (_ and windows) or os.getenv("WINDIR");
local coroutine, io, math, string, table =
coroutine, io, math, string, table;
-local ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, unpack=
- ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, table.unpack or unpack;
+local ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type =
+ ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type;
local ztact = { -- public domain 20080404 lua@ztact.com
get = function(parent, ...)