Merge branch 'stable-3.1' into 'stable-3.1'

Marius Burkard

2016-07-05 72cefc438c0d279be66cd95c7b42a021ae647d51

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