Merge branch 'mail-fix-style' into 'stable-3.1'

Till Brehm

2016-04-13 9301bdae65a51798040a163cff53c46dd1c9f33c

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