# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365723946 -3600
# Node ID fcdcc37ffec16a584b83ca5e1199a75afb4928cc
# Parent  9b7c919bf238063ab3857729f88d2b61522080a7# Parent  2660407c3b736203d0f3b82ba4b15dbf8ab4b44c
Merge 0.9->trunk

diff -r 2660407c3b73 -r fcdcc37ffec1 prosodyctl
--- a/prosodyctl	Fri Apr 12 00:44:49 2013 +0100
+++ b/prosodyctl	Fri Apr 12 00:45:46 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