Thu, 25 Mar 2010 18:53:17 +0000
Merge 0.7->trunk
--- 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}