Merge remote-tracking branch 'renky/vhostalias'

Marius Cramer

2014-01-24 e60d4c7e35e5dd3a5f4fb1d5b3a25345b6275146

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