Merge branch 'renky/ispconfig3-master'

Marius Cramer

2015-01-21 82cf1e84254fc9023b4871ba40967cc4966c9452

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