diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-07-28 09:39:50 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-07-28 09:39:50 +0100 |
| commit | d6780dd7edf90f052074613505fd5917e76b72e6 (patch) | |
| tree | c1767a4b6577725fbe5586acab5a2453c18b373a /net | |
| parent | a12109bf85c36060767fb57446ea7c8b13b3afa7 (diff) | |
| parent | add57bd7f62cd2ff4c5b5b72bceef0f74f8b1626 (diff) | |
| download | prosody-d6780dd7edf90f052074613505fd5917e76b72e6.tar.gz prosody-d6780dd7edf90f052074613505fd5917e76b72e6.zip | |
Merge 0.10 -> trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/dns.lua | 4 |
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, ...) |