diff options
author | Waqas Hussain <waqas20@gmail.com> | 2011-03-02 05:15:54 +0500 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2011-03-02 05:15:54 +0500 |
commit | 7f91aa41c7a34cf3c516666b2137996327361550 (patch) | |
tree | 397f7f3f8691fc18674914123a2e1e39da7647a1 /prosody | |
parent | ac2adeb1ada41f343aeb340ac5894b41d3e10162 (diff) | |
parent | 5ef073957a08aeb1874b0900d1e4fd603b2a1513 (diff) | |
download | prosody-7f91aa41c7a34cf3c516666b2137996327361550.tar.gz prosody-7f91aa41c7a34cf3c516666b2137996327361550.zip |
Merge 0.8->trunk.
Diffstat (limited to 'prosody')
-rwxr-xr-x | prosody | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -345,6 +345,7 @@ function load_secondary_libraries() ]] require "net.connlisteners"; + require "net.httpserver"; require "util.stanza" require "util.jid" |