# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1269543197 0
# Node ID 855c0eb8060056a7a37e59bcf0a85f55a01713c0
# Parent  29ec7cd77f81420c154da112cf493fa2cdb90090# Parent  9236a78566883aee95ed6964633c711b3cbfea46
Merge 0.7->trunk

diff -r 29ec7cd77f81 -r 855c0eb80600 tools/ejabberd2prosody.lua
--- 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}