s2smanager: Trim trailing whitespace

mod_saslauth: Oops.

Merge with Paul

mod_muc/muc.lib: Use stanza:get_child() to locate MUC child element

mod_saslauth: Use module:get_option()

mod_saslauth: Add sasl_backend config parameter

Merge with Rob

Added notification of configuration changes for MUCs

Add support for non-anonymous MUC rooms

prosodyctl: Gracefully handle a missing stty command, and fall back to ANSI escape sequences

mod_httpserver: Rudimentary directory detection, return forbidden instead of causing a traceback (since commit 0325f241a26c)

prosody.cfg.lua.dist: Remove lie about requiring console_enabled

prosody.cfg.lua.dist: Remove trailing whitespace

util.events: Rename add_plugin() and remove_plugin() to add_handlers() and remove_handlers() respectively

util.signal: Update header comment for new filename

(0) -1000 -300 -100 -15 +15 +100 +300 +1000 tip

mercurial