Merge branch 'dns_delete_check' into 'master'

Marius Cramer

2014-07-30 d57ffdc6c176209b63ba461de4564d13ec388fed

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