# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1443780812 -7200
# Node ID 47cd0b4b55449953766a5b3beedcfa90c464468b
# Parent  39c5c49616ab361804bbf44449426f57c5391b76# Parent  7f7920f2aebf8040375c3f88ed6ad4383ed40ed6
Merge 0.10->trunk

diff -r 39c5c49616ab -r 47cd0b4b5544 util/jid.lua
--- a/util/jid.lua	Sun Sep 27 00:37:18 2015 +0200
+++ b/util/jid.lua	Fri Oct 02 12:13:32 2015 +0200
@@ -36,7 +36,11 @@
 end
 
 local function bare(jid)
-	return jid and match(jid, "^[^/]+");
+	local node, host = _split(jid);
+	if node and host then
+		return node.."@"..host;
+	end
+	return host;
 end
 
 local function prepped_split(jid)