# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365723130 -3600
# Node ID 9b7c919bf238063ab3857729f88d2b61522080a7
# Parent  953888c3107189ed2cea979fd531a0c07fe4f993# Parent  e3b9dc9dd9402d9b80b1ff285bb34dd0a5da08fe
Merge 0.9->trunk

diff -r e3b9dc9dd940 -r 9b7c919bf238 prosodyctl
--- a/prosodyctl	Fri Apr 12 00:31:05 2013 +0100
+++ b/prosodyctl	Fri Apr 12 00:32:10 2013 +0100
@@ -135,7 +135,7 @@
 -- Switch away from root and into the prosody user --
 local switched_user, current_uid;
 
-local want_pposix_version = "0.3.5";
+local want_pposix_version = "0.3.6";
 local ok, pposix = pcall(require, "util.pposix");
 
 if ok and pposix then