Software / code / prosody
Changeset
2944:855c0eb80600
Merge 0.7->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 25 Mar 2010 18:53:17 +0000 |
| parents | 2942:29ec7cd77f81 (current diff) 2943:9236a7856688 (diff) |
| children | 2948:1ac5ef6ce1a0 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/ejabberd2prosody.lua Thu Mar 25 12:33:45 2010 +0000 +++ b/tools/ejabberd2prosody.lua Thu Mar 25 18:53:17 2010 +0000 @@ -17,6 +17,8 @@ require "erlparse"; +prosody = {}; + local serialize = require "util.serialization".serialize; local st = require "util.stanza"; package.loaded["util.logger"] = {init = function() return function() end; end}
