Merge 0.10->trunk

[prosody.git] / prosody

diff --git a/prosody b/prosody
index e6a23d8e703f6fb172f188d45a6e87a089fde333..61be6c2e29218d4e16c4bb0949c9c55d72cb0bac 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -121,6 +121,7 @@ end
 
 function load_libraries()
        -- Load socket framework
+       socket = require "socket";
        server = require "net.server"
 end