Merge branch '0.9.x' into 1.0.x

Conflicts:
	lib/queuemanager.php

1 files changed, 1 insertions, 1 deletions

diff --git a/scripts/imdaemon.php b/scripts/imdaemon.php
index c37a26b7c..ffb5ecf0d 100755
--- a/scripts/imdaemon.php
+++ b/scripts/imdaemon.php
@@ -54,7 +54,7 @@ class ImDaemon extends SpawningDaemon
 
         common_log(LOG_INFO, 'terminating normally');
 
-        return true;
+        return $master->respawn ? self::EXIT_RESTART : self::EXIT_SHUTDOWN;
     }
 
 }