Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into st...

Marius Burkard

2016-05-09 e3f2e5fd1075fd32837a7f767647156d6c7f47e9

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