Merge branch 'spamfilter-delete-fix' into 'stable-3.1'

Till Brehm

2016-07-11 a62af307fd9bf33b34df292120cb73e37d8223da

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