Merge branch 'pixcept/ispconfig3-mods-new-layout-3.1'

Marius Cramer

2015-01-08 3b0546fc2539df441819dbf05d679d349c62267a

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