Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 25 Mar 2010 18:53:17 +0000
changeset 2944 855c0eb80600
parent 2942 29ec7cd77f81 (current diff)
parent 2943 9236a7856688 (diff)
child 2948 1ac5ef6ce1a0
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}