Merge branch 'spanish_translation' into 'master'

Marius Cramer

2014-06-28 c67eea43798034415e7bcdbb49f90e8d6e3a141d

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