core.s2smanager: Remove some debugging

Merge

Merge

net.adns: Catch errors in DNS response callbacks

prosody: Don't look to use SSL when LuaSec not available (thanks Florob)

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

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

mercurial