Merge branch '0.8.x' into 0.9.x

Conflicts:
	actions/updateprofile.php
	actions/userauthorization.php
	classes/User_group.php
	index.php
	install.php
	lib/accountsettingsaction.php
	lib/logingroupnav.php

1 files changed, 4 insertions, 2 deletions

diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 179f0de09..67636d342 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -387,5 +387,7 @@ class MailerDaemon
     }
 }
 
-$md = new MailerDaemon();
-$md->handle_message('php://stdin');
+if (common_config('emailpost', 'enabled')) {
+    $md = new MailerDaemon();
+    $md->handle_message('php://stdin');
+}