Merge 0.9->trunk

author: Kim Alvefur <zash@zash.se>
date: Tue, 09 Apr 2013 15:51:08 +0200
parent: 5442:e66973c81e89
parent: 5456:87204440b9dd
child: 5534:522e99b898a0
--- 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