# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1365515468 -7200
# Node ID 953888c3107189ed2cea979fd531a0c07fe4f993
# Parent  16493e410fa847fcbb1b1a6a9e9d5e7e37fb4d3a# Parent  87204440b9ddd6a374f862977b90b64fcb4207b0
Merge 0.9->trunk

diff -r 16493e410fa8 -r 953888c31071 prosodyctl
--- a/prosodyctl	Mon Apr 08 22:43:27 2013 +0200
+++ b/prosodyctl	Tue Apr 09 15:51:08 2013 +0200
@@ -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