# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1455804017 -3600
# Node ID af26e8eb591f4a0a42e5842d7fa560b2d631f419
# Parent  8380b595a33bd159522d55542a1d0f4bd781825e# Parent  eadbf19d0de05fcc7ab8ae480f1fbcdf2ba7008a
Merge 0.10->trunk

diff -r 8380b595a33b -r af26e8eb591f core/loggingmanager.lua
--- a/core/loggingmanager.lua	Thu Feb 18 13:49:19 2016 +0000
+++ b/core/loggingmanager.lua	Thu Feb 18 15:00:17 2016 +0100
@@ -16,7 +16,8 @@
 local os_date = os.date;
 local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
 local tostring = tostring;
-local select, unpack = select, table.unpack or unpack;
+local select = select;
+local unpack = table.unpack or unpack; --luacheck: ignore 113
 
 local config = require "core.configmanager";
 local logger = require "util.logger";
diff -r 8380b595a33b -r af26e8eb591f core/moduleapi.lua
--- a/core/moduleapi.lua	Thu Feb 18 13:49:19 2016 +0000
+++ b/core/moduleapi.lua	Thu Feb 18 15:00:17 2016 +0100
@@ -23,7 +23,7 @@
 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;
diff -r 8380b595a33b -r af26e8eb591f core/modulemanager.lua
--- a/core/modulemanager.lua	Thu Feb 18 13:49:19 2016 +0000
+++ b/core/modulemanager.lua	Thu Feb 18 15:00:17 2016 +0100
@@ -23,7 +23,8 @@
 local ipairs, pairs, type, tostring, t_insert = ipairs, pairs, type, tostring, table.insert;
 
 local debug_traceback = debug.traceback;
-local unpack, select = unpack, select;
+local select = select;
+local unpack = table.unpack or unpack; --luacheck: ignore 113
 local pcall = function(f, ...)
 	local n = select("#", ...);
 	local params = {...};