Merge branch 'master' into 'master'

Marius Cramer

2015-09-18 5cc181a90f7d27f4ec578a8a892b4dd0ca44adf4

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