Merge with trunk

net.dns: Fixed indentation and coding style.

util.dataforms: Support for jid-multi field type

net.dns: Initialize default resolver on module load (instead of on first use).

net.dns: Updated to use util.windows.get_nameservers for enumerating nameservers on Windows.

net.httpserver: Pass correct connection object to disconnect listener, which fixes a small leak

prosodyctl: Put 'pidfile' in quotes to make more clear that it is the literal name of the option

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

mercurial