Merge timber->trunk - thanks everyone!

[prosody.git] / prosody

diff --git a/prosody b/prosody
index f79910b723b9f3985e313cfa7ca43b3a1336fa16..64021fd32f2548ce4ac65417229e957cebcf7109 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -280,6 +280,7 @@ function load_secondary_libraries()
        require "util.xmppstream"
        require "core.rostermanager"
        require "core.hostmanager"
+       require "core.portmanager"
        require "core.modulemanager"
        require "core.usermanager"
        require "core.sessionmanager"
@@ -306,8 +307,6 @@ function load_secondary_libraries()
        if remdebug then remdebug.engine.start() end
        ]]
 
-       require "net.httpserver";
-       
        require "util.stanza"
        require "util.jid"
 end