Merge with trunk

mod_welcome: Change $user to $username in default welcome message (thanks to chris for spotting)

Prosody top-level error handler modified to log properly on non-string error messages.

mod_console: Added proper cleanup for disconnected console sessions.

MUC: Fixed: affiliation='none' was omitted from some presence broadcasts.

xmppserver_listener: Minor logging fix: Prefer the session logger when available to log invalid XML warnings.

MUC: Fixed an issue with multi-session nicks where the 'from' attribute in a presence broadcast was not being properly set.

server.lua: Add addsocket(), refactor all code to use it, fixes nasty socket object leak - moral of the story is to not duplicate code, and not prematurely optimise. But you knew that already didn't you?

rostermanager: Fixed a global access.

rostermanager: Refactored roster loading to remove duplicate code.

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

mercurial