Merge branch 'ftp-autoexpire' into 'master'

Marius Cramer

2014-05-12 1d258eef7ce12c81cf4707ea62b4d2f1ae7b1a91

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