Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2015-12-20 dedf5feaa2cf3072e90ac2bf2ef3885facd2e1a6

 remoting_client/examples/sites_shell_user_update.php

@@ -15,7 +15,7 @@
   }

   //* Parameters
   $client_id = 3;
   $client_id = 0;
   $shell_user_id = 1;