# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1489756111 0
# Node ID ae3c5abb3336cf3ec1f0a02804c37b2fdfd9b459
# Parent  e30b0cbed47286849cc6266bdc4e0abe3ed99d37# Parent  879be73c0a58dc817a9e6eb13c271377521f2e01
Merge 0.10 -> trunk

diff -r e30b0cbed472 -r ae3c5abb3336 plugins/mod_pubsub/mod_pubsub.lua
--- a/plugins/mod_pubsub/mod_pubsub.lua	Thu Mar 16 23:49:27 2017 +0100
+++ b/plugins/mod_pubsub/mod_pubsub.lua	Fri Mar 17 13:08:31 2017 +0000
@@ -9,7 +9,7 @@
 
 local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false);
 local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false);
-local pubsub_disco_name = module:get_option_string("name" "Prosody PubSub Service");
+local pubsub_disco_name = module:get_option_string("name", "Prosody PubSub Service");
 local expose_publisher = module:get_option_boolean("expose_publisher", false)
 
 local service;