# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1443781061 -7200
# Node ID 214a62915368cadcaaf3c9368365c67ed280b029
# Parent  47cd0b4b55449953766a5b3beedcfa90c464468b# Parent  7f76c77ddcb885260bbf3cb379d683bcf2b808e3
Merge 0.10->trunk

diff -r 47cd0b4b5544 -r 214a62915368 util/jid.lua
--- a/util/jid.lua	Fri Oct 02 12:13:32 2015 +0200
+++ b/util/jid.lua	Fri Oct 02 12:17:41 2015 +0200
@@ -36,7 +36,7 @@
 end
 
 local function bare(jid)
-	local node, host = _split(jid);
+	local node, host = split(jid);
 	if node and host then
 		return node.."@"..host;
 	end