Merge branch 'mail_filter_fix' into 'master'

Till Brehm

2016-03-22 069b2fea73b3613776af8ced5f20fc1bac269121

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