Merge branch 'develop' into 'master'

Falko Timme

2014-12-13 39fab06dfae1e0218a1bb3aa48a381586dfaea6d

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