Merge 0.10->trunk

prosodyctl

@@ -233,6 +233,7 @@ local function make_host(hostname)
 		type = "local",
 		events = prosody.events,
 		modules = {},
+		sessions = {},
 		users = require "core.usermanager".new_null_provider(hostname)
 	};
 end

util-src/crand.c

@@ -23,7 +23,7 @@
  * TODO: Decide on fixed size or dynamically allocated buffer
  */
 #if 1
-#include <malloc.h>
+#include <stdlib.h>
 #else
 #define BUFLEN 256
 #endif