# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1459258694 -7200
# Node ID 7e6409462f79899a674508403758b046d124ca56
# Parent  3849b5187d475cdb30de241ea4fc83067c99f504# Parent  a1570219b8659a3da4a985d66645a9b14b9c8fbc
Merge 0.10->trunk

diff -r 3849b5187d47 -r 7e6409462f79 net/dns.lua
--- a/net/dns.lua	Sat Mar 26 20:17:59 2016 +0000
+++ b/net/dns.lua	Tue Mar 29 15:38:14 2016 +0200
@@ -22,8 +22,8 @@
 local coroutine, io, math, string, table =
       coroutine, io, math, string, table;
 
-local ipairs, next, pairs, print, setmetatable, tostring, assert, error, unpack, select, type=
-      ipairs, next, pairs, print, setmetatable, tostring, assert, error, unpack, select, type;
+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 ztact = { -- public domain 20080404 lua@ztact.com
 	get = function(parent, ...)
diff -r 3849b5187d47 -r 7e6409462f79 net/server_select.lua
diff -r 3849b5187d47 -r 7e6409462f79 util/jid.lua
--- a/util/jid.lua	Sat Mar 26 20:17:59 2016 +0000
+++ b/util/jid.lua	Tue Mar 29 15:38:14 2016 +0200
@@ -8,6 +8,7 @@
 
 
 
+local select = select;
 local match, sub = string.match, string.sub;
 local nodeprep = require "util.encodings".stringprep.nodeprep;
 local nameprep = require "util.encodings".stringprep.nameprep;