Merge branch 'master' into 'master'

Marius Cramer

2015-10-23 3ff9d214bf9f34c1ffc5f40227119eb44693363d

1
ALTER TABLE  `mail_user` ADD  `autoresponder_subject` VARCHAR(255) NOT NULL DEFAULT 'Out of office reply' AFTER  `autoresponder_end_date`;