# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1520711534 -3600
# Node ID 0c322389f994e2b7b00458b59f73da12b8498e3f
# Parent  c3b87a37c1009ded7a2e1dd4d41b35c9940ea593# Parent  4b5a00fffb22c7e3637e9e8ca8ac4d68f0d6bd56
Merge 0.10->trunk

diff -r c3b87a37c100 -r 0c322389f994 .hgtags
--- a/.hgtags	Sat Mar 10 02:28:29 2018 +0100
+++ b/.hgtags	Sat Mar 10 20:52:14 2018 +0100
@@ -61,3 +61,4 @@
 8613086779fa9276615c2af066d2a10c38d0c86e 0.9.11
 2a7b52437167a5c7b6c8a5bc79f4463afe092fd5 0.9.12
 39966cbc29f46d7ae9660edca8683d5121c82edf 0.10.0
+082d127286451eb55420c36424dd321e8d9bceee 0.9.13
diff -r c3b87a37c100 -r 0c322389f994 plugins/mod_admin_telnet.lua
--- a/plugins/mod_admin_telnet.lua	Sat Mar 10 02:28:29 2018 +0100
+++ b/plugins/mod_admin_telnet.lua	Sat Mar 10 20:52:14 2018 +0100
@@ -1151,7 +1151,7 @@
 			local http_host = module:context(host):get_option_string("http_host");
 			print("HTTP endpoints on "..host..(http_host and (" (using "..http_host.."):") or ":"));
 			for _, provider in ipairs(http_apps) do
-				local url = module:context(host):http_url(provider.name);
+				local url = module:context(host):http_url(provider.name, provider.default_path);
 				print("", url);
 			end
 			print("");
diff -r c3b87a37c100 -r 0c322389f994 plugins/muc/muc.lib.lua