Merge with 0.7

Sun, 21 Feb 2010 16:43:05 +0000

author
Matthew Wild <mwild1@gmail.com>
date
Sun, 21 Feb 2010 16:43:05 +0000
changeset 2686
21e486ba4029
parent 2684
837e697562ad (current diff)
parent 2685
95d665f20c71 (diff)
child 2690
6863b629aa6a

Merge with 0.7

--- 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)

mercurial