# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266770585 0
# Node ID 21e486ba40297372618276fed8f04f097c3f1919
# Parent  837e697562ad9ce9e3e0acf61de6d707731d8352# Parent  95d665f20c71151cac8eeb04c2228c2ea36d5c2d
Merge with 0.7

diff -r 837e697562ad -r 21e486ba4029 tools/ejabberdsql2prosody.lua
--- a/tools/ejabberdsql2prosody.lua	Sat Feb 20 00:53:04 2010 +0000
+++ b/tools/ejabberdsql2prosody.lua	Sun Feb 21 16:43:05 2010 +0000
@@ -254,7 +254,7 @@
 for i, row in ipairs(t["users"] or NULL) do
 	local node, password = row.username, row.password;
 	local ret, err = dm.store(node, host, "accounts", {password = password});
-	print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password);
+	print("["..(err or "success").."] accounts: "..node.."@"..host);
 end
 
 function roster(node, host, jid, item)