Merge branch 'domain_module_fixes' into 'master'

Marius Cramer

2014-08-13 8abd175abb8a5abfd25bc9172554bc05c8ce40c3

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