# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1456309200 -3600
# Node ID df4f52cabdfe6020985825042f6661d11b6649db
# Parent  e8f20be3e6f873d6490884d091d07571a0fef7f0# Parent  7a14ea196db306a5e9bacab3b5b402ace61ebaf2
Merge 0.10->trunk

diff -r e8f20be3e6f8 -r df4f52cabdfe prosodyctl
--- a/prosodyctl	Mon Feb 22 18:46:59 2016 +0100
+++ b/prosodyctl	Wed Feb 24 11:20:00 2016 +0100
@@ -233,6 +233,7 @@
 		type = "local",
 		events = prosody.events,
 		modules = {},
+		sessions = {},
 		users = require "core.usermanager".new_null_provider(hostname)
 	};
 end
diff -r e8f20be3e6f8 -r df4f52cabdfe util-src/crand.c
--- a/util-src/crand.c	Mon Feb 22 18:46:59 2016 +0100
+++ b/util-src/crand.c	Wed Feb 24 11:20:00 2016 +0100
@@ -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