# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1455801861 0
# Node ID f11d6c9d1c1f4510c8ca698c0252e70375c18618
# Parent  0890a428a99bf650aa2c2746906a3a901e07e217# Parent  e5412e685991b352184fb9814fac1a402ff0e1a2
Merge 0.10->trunk

diff -r 0890a428a99b -r f11d6c9d1c1f core/loggingmanager.lua
--- a/core/loggingmanager.lua	Wed Feb 10 07:57:58 2016 +0100
+++ b/core/loggingmanager.lua	Thu Feb 18 13:24:21 2016 +0000
@@ -16,7 +16,7 @@
 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";