Merge

sessionmanager, componentmanager: Fix some wacky indentation (thanks greyback!)

mod_debug: Run on a different port, and use a different listener to mod_console

Automated merge with http://waqas.ath.cx:8000/

Fixed: Send correct error reply for IQs directed at unavailable resources

Fixed: Issue with presence error routing

mod_muc: Fix malformed presence stanzas (thanks elmex)

util.stanza: stanza:reset() method to reset building state

core.s2smanager: Look away... wait for it... now! Hopefully s2s should be back to normal.

net.server: Ensure some logging parameters are strings

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

mercurial