Merge with 0.6 on prosody.im 0.6.0

xmppclient_listener: Escape control characters when logging invalid XML.

Merge with 0.6

s2smanager: Log warning when trying to send a stanza from a host we don't serve, instead of a traceback (thanks stpeter)

Merge with trunk

net.server: Log an error when libevent is requested, but luaevent is unavailable, and don't load luaevent when not requested.

core.sessionmanager, net.*_listener: Remove the evil collectgarbage() calls

Merge with trunk

Merged with 0.6.

prosody: Added support for command line argument '--config'.

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

mercurial