Merge branch 'florian030/ispconfig3-master' into stable-3.1

Marius Burkard

2016-06-14 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;