Merge pull request #357 in ZP/z-push from...

Merge pull request #357 in ZP/z-push from bugfix/ZP-1039-z-push-admin-returns-exit-code-0 to develop

* commit '102507ff':
  ZP-1039 Don't use die() to terminate in error case for gab-sync.
  ZP-1039 Don't use die() to terminate in error case for z-push-admin.

Conflicts:
	tools/gab-sync/gab-sync.php

src/z-push-admin.php

@@ -122,7 +122,8 @@ include('version.php');
         ZPushAdminCLI::RunCommand();
     }
     catch (ZPushException $zpe) {
-        die(get_class($zpe) . ": ". $zpe->getMessage() . "\n");
+        fwrite(STDERR, get_class($zpe) . ": ". $zpe->getMessage() . "\n");
+        exit(1);
     }
 
 
@@ -936,4 +937,4 @@ class ZPushAdminCLI {
 }
 
 
-?>
\ No newline at end of file
+?>