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!)

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

mercurial