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'.

Merge with 0.6

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

mercurial