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

Till Brehm

2016-07-11 a62af307fd9bf33b34df292120cb73e37d8223da

1
ALTER TABLE `directive_snippets` ADD `master_directive_snippets_id` int(11) unsigned NOT NULL DEFAULT '0' AFTER `active`;