# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1241642725 -3600
# Node ID 83a150e3b3bb0563f51de7756e2a4bca8db37a13
# Parent  f6dc334d9836c5edfd17783fec9c8da2d9324081# Parent  442c87de8e2df1e3903f005a9c8d4ea276925933
Merge with 0.4

diff -r f6dc334d9836 -r 83a150e3b3bb .hgtags
--- a/.hgtags	Tue May 05 21:13:09 2009 +0500
+++ b/.hgtags	Wed May 06 21:45:25 2009 +0100
@@ -22,3 +22,4 @@
 13ae298c67d78485f1d795fcc7ffeb2057876fb7 0.3.0
 84202314ab7f974f7e3b5706e65ddadb9b99274b 0.4.0
 4aff205cc4cd5e1e22f5130fecc47d24be1ee5bf 0.4.0
+b2e548344d61ebbfd1474baedc5aa187f874948a 0.4.1
diff -r f6dc334d9836 -r 83a150e3b3bb util/prosodyctl.lua
--- a/util/prosodyctl.lua	Tue May 05 21:13:09 2009 +0500
+++ b/util/prosodyctl.lua	Wed May 06 21:45:25 2009 +0100
@@ -9,6 +9,9 @@
 
 local io, os = io, os;
 local tostring, tonumber = tostring, tonumber;
+
+local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
+
 module "prosodyctl"
 
 function adduser(params)
diff -r f6dc334d9836 -r 83a150e3b3bb util/serialization.lua
--- a/util/serialization.lua	Tue May 05 21:13:09 2009 +0500
+++ b/util/serialization.lua	Wed May 06 21:45:25 2009 +0100
@@ -52,7 +52,8 @@
 	elseif type(o) == "boolean" then
 		func(t, (o and "true" or "false"));
 	else
-		log("warn", "cannot serialize a %s: %s", type(o), debug_traceback())
+		log("error", "cannot serialize a %s: %s", type(o), debug_traceback())
+		func(t, "nil,\n");
 	end
 end