Merge branch 'feature/git-attributes' into 'stable-3.1'

Marius Burkard

2016-03-02 1325b11714cddb3be557aee5c3ec03f29cee69f4

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