# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1455061212 0
# Node ID 81b109281879b381e021884a34993eb2020614f0
# Parent  0db9cb909cf18b0242f83d47e4b04c2fdbea6904# Parent  7be4ebefd1f4e0ccfb9a3b6c247b1135e095cb66
Merge with Zash

diff -r 7be4ebefd1f4 -r 81b109281879 client.lua
--- a/client.lua	Wed Jan 13 00:45:54 2016 +0100
+++ b/client.lua	Tue Feb 09 23:40:12 2016 +0000
@@ -86,7 +86,7 @@
 	function self.data(conn, data)
 		local ok, err = self.stream:feed(data);
 		if ok then return; end
-		self:debug("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
+		self:debug("Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
 		self:close("xml-not-well-formed");
 	end
 	
diff -r 7be4ebefd1f4 -r 81b109281879 component.lua
--- a/component.lua	Wed Jan 13 00:45:54 2016 +0100
+++ b/component.lua	Tue Feb 09 23:40:12 2016 +0000
@@ -59,7 +59,7 @@
 	function self.data(conn, data)
 		local ok, err = self.stream:feed(data);
 		if ok then return; end
-		stream:debug("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
+		stream:debug("Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "));
 		stream:close("xml-not-well-formed");
 	end