Merge 0.7->trunk

diff --cc prosody
index 0bcfce4b3f5ca696eb2b54f7fc2574c43a9bc36c,517762f3c438d4d7061739f7a8f3ec95e86d3175..fd6a051c420fb5ef5936592fb44e4394961430c1
--- 1/prosody
--- 2/prosody
+++ b/prosody
@@@ -335,9 -329,8 +329,8 @@@ function init_data_store(
  end
  
  function prepare_to_start()
 -      log("debug", "Prosody is using the %s backend for connection handling", server.get_backend());
 +      log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
        -- Signal to modules that we are ready to start
-       eventmanager.fire_event("server-starting");
        prosody.events.fire_event("server-starting");
  
        -- start listening on sockets