diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-25 18:53:17 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-25 18:53:17 +0000 |
| commit | a439209b6872f72a4f2cbc1c25eeb64ee70463d2 (patch) | |
| tree | 897caea564bb033b3b03562a22c20128f56389c4 | |
| parent | d06b399a17f3cb6dd362a4a97aa35e3c0d229cd5 (diff) | |
| parent | fb8aa8bc8b7c748d33f3c07a00c8d7b9f45f454f (diff) | |
| download | prosody-a439209b6872f72a4f2cbc1c25eeb64ee70463d2.tar.gz prosody-a439209b6872f72a4f2cbc1c25eeb64ee70463d2.zip | |
Merge 0.7->trunk
| -rwxr-xr-x | tools/ejabberd2prosody.lua | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua index d44c929b..a231abd8 100755 --- a/tools/ejabberd2prosody.lua +++ b/tools/ejabberd2prosody.lua @@ -17,6 +17,8 @@ end require "erlparse"; +prosody = {}; + local serialize = require "util.serialization".serialize; local st = require "util.stanza"; package.loaded["util.logger"] = {init = function() return function() end; end} |