# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1566340602 -7200
# Node ID a53126b7fe22e0afd6c4b47b337c543fadaddf49
# Parent  9fdda9fafc3c511bced52180437b08c2b74ec1dd# Parent  224e681c4db2d6e19c0ea5b3cae7f500e23d5d30
Merge 0.11->trunk

diff -r 9fdda9fafc3c -r a53126b7fe22 plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Mon Aug 19 12:17:17 2019 +0100
+++ b/plugins/muc/muc.lib.lua	Wed Aug 21 00:36:42 2019 +0200
@@ -359,6 +359,7 @@
 module:hook("muc-disco#info", function(event)
 	event.reply:tag("feature", {var = "http://jabber.org/protocol/muc"}):up();
 	event.reply:tag("feature", {var = "http://jabber.org/protocol/muc#stable_id"}):up();
+	event.reply:tag("feature", {var = "http://jabber.org/protocol/muc#self-ping-optimization"}):up();
 end);
 module:hook("muc-disco#info", function(event)
 	table.insert(event.form, { name = "muc#roominfo_occupants", label = "Number of occupants" });