MUC: Added legacy error codes to nickname conflict presence errors.

Merge with trunk

MUC: Added MUC feature to the disco#info replies of rooms.

Merge with 0.5

net.dns: Respect commented nameserver entries in resolv.conf (thanks Remko)

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

Re-tagging 0.5.2

mod_httpserver: Configurable filesystem path to serve from

Re-tagging 0.5.2

prosody.cfg.lua.dist: Add example of declaring admins for a server

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

mercurial