Merge branch 'Quest/ispconfig3-master'

Marius Cramer

2015-03-31 cab4ba3af9dfd02c303d3b4714700269133f35bf

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