Merge branch 'master' into 'master'

Marius Cramer

2015-01-10 0d5e54e5a149a24f8cc04989be2e7611d98852a4

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