# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1495898355 -7200
# Node ID 745e0a78305536dcd44bd2375f35cb40e179bc16
# Parent  6300394bb7138b89a9f5a19c242cff58906844a8# Parent  f0d847316723ddd4c453c0478adca00221122479
Merge 0.9->0.10

diff -r 6300394bb713 -r 745e0a783055 plugins/mod_disco.lua
--- a/plugins/mod_disco.lua	Sat May 27 16:42:50 2017 +0200
+++ b/plugins/mod_disco.lua	Sat May 27 17:19:15 2017 +0200
@@ -175,6 +175,7 @@
 		end
 		local reply = st.reply(stanza):tag('query', {xmlns='http://jabber.org/protocol/disco#info'});
 		if not reply.attr.from then reply.attr.from = origin.username.."@"..origin.host; end -- COMPAT To satisfy Psi when querying own account
+		reply:tag('identity', {category='account', type='registered'}):up();
 		module:fire_event("account-disco-info", { origin = origin, reply = reply });
 		origin.send(reply);
 		return true;