Merge branch 'master' into 'master'

Marius Cramer

2015-02-15 427cd2f62e87fc13fee43ecf764418c7ca5ae520

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