# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1266770677 0
# Node ID b669a0ae99e2c412d890f80ad49f3cd658a00fb4
# Parent  6863b629aa6a9d83ade522e3d98d5f859e5ba599# Parent  2045d13ba01837e92fd06086fef536e81171561e
Merge trunk with trunk

diff -r 2045d13ba018 -r b669a0ae99e2 tools/ejabberdsql2prosody.lua
--- a/tools/ejabberdsql2prosody.lua	Sun Feb 21 17:47:49 2010 +0500
+++ b/tools/ejabberdsql2prosody.lua	Sun Feb 21 16:44:37 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)