Merge branch 'master' into 'master'

Marius Cramer

2014-02-11 e2b4f760bb91caf66445a888c7a185e972e97a3c

 server/scripts/ispconfig_update.php

@@ -100,7 +100,7 @@
      echo "There are no updates available for ISPConfig ".ISPC_APP_VERSION."\n";
   }
} else {
   passthru('/usr/local/ispconfig/server/scripts/update_from_svn.sh');
   passthru('/usr/local/ispconfig/server/scripts/update_from_dev.sh');
   exit;
}