Merge

prosody: Simple whitespace fix in error output

core.configmanager: Fire event when (re)loading config file

net.server: Fix potential nil handler usage

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

Stopped using presencemanager in stanza_router

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

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

mercurial