Merge branch 'spanish_translation' into 'master'

Marius Cramer

2014-06-28 c67eea43798034415e7bcdbb49f90e8d6e3a141d

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;