s2smanager: Fix syntax error)

s2smanager: require_s2s_encryption -> s2s_require_encryption

s2smanager: Make require_s2s_encryption do what it says on the tin

hostmanager: Trailing whitespace

net.server_event: Trailing whitespace

net.server_event: Support :setlistener() method on connections to work with port multiplexing

Merge with trunk.

mod_presence: Quick fix to make probes from local users to local hosts work.

mod_presence: Added handler for presence subscriptions and probes to local hosts.

stanza_router: Added third parameter to core_post_stanza, to control pre-events.

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

mercurial