Merge branch 'domain_specific_welcome_message' into 'stable-3.1'

Marius Burkard

2016-01-20 6cc90d3444407a32d5a1f6ff29ebf8f01c0e760d

1
ALTER TABLE `mail_user` ADD `disablesieve-filter` ENUM( 'y', 'n' ) NOT NULL DEFAULT 'n' AFTER `disablesieve`;