aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-02-18 13:24:21 +0000
committerMatthew Wild <mwild1@gmail.com>2016-02-18 13:24:21 +0000
commit7e0b29e4e26c0c1f0403f79e85bbb377035502bf (patch)
treee58bdeea676840f3fe75618c1d1516448ddc431b
parentca7a512e35b8522ada592f14ac375329ab786a30 (diff)
parent952ba43fea2d02b6a6f077274e869280288a87cd (diff)
downloadprosody-7e0b29e4e26c0c1f0403f79e85bbb377035502bf.tar.gz
prosody-7e0b29e4e26c0c1f0403f79e85bbb377035502bf.zip
Merge 0.10->trunk
-rw-r--r--core/loggingmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 77d31964..14dd4360 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -16,7 +16,7 @@ local math_max, rep = math.max, string.rep;
local os_date = os.date;
local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
local tostring = tostring;
-local unpack = table.unpack or unpack;
+local select, unpack = select, table.unpack or unpack;
local config = require "core.configmanager";
local logger = require "util.logger";