diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-02-18 13:24:21 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-02-18 13:24:21 +0000 |
| commit | 1af7a6e39efb724bd2693fa51d8484094927648c (patch) | |
| tree | e58bdeea676840f3fe75618c1d1516448ddc431b /core | |
| parent | c86ef31dfa4823aa9791f5b253acc4654c69d0f8 (diff) | |
| parent | 63b4f27dfb4611859e9115a67ad72420bf5217b8 (diff) | |
| download | prosody-1af7a6e39efb724bd2693fa51d8484094927648c.tar.gz prosody-1af7a6e39efb724bd2693fa51d8484094927648c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/loggingmanager.lua | 2 |
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"; |