Merge branch 'fix_initial_ip_select' into 'master'

Marius Cramer

2014-08-22 b4f3f515ba92d74006f1f44f5e97c6625cfd8f43

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