aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-03-02 05:15:54 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-03-02 05:15:54 +0500
commit7f91aa41c7a34cf3c516666b2137996327361550 (patch)
tree397f7f3f8691fc18674914123a2e1e39da7647a1 /prosody
parentac2adeb1ada41f343aeb340ac5894b41d3e10162 (diff)
parent5ef073957a08aeb1874b0900d1e4fd603b2a1513 (diff)
downloadprosody-7f91aa41c7a34cf3c516666b2137996327361550.tar.gz
prosody-7f91aa41c7a34cf3c516666b2137996327361550.zip
Merge 0.8->trunk.
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody1
1 files changed, 1 insertions, 0 deletions
diff --git a/prosody b/prosody
index 0aba4bb6..86e82490 100755
--- a/prosody
+++ b/prosody
@@ -345,6 +345,7 @@ function load_secondary_libraries()
]]
require "net.connlisteners";
+ require "net.httpserver";
require "util.stanza"
require "util.jid"