Merge branch 'master' into 'master'

Marius Burkard

2016-01-12 ee60c95a22aad82742bd9da439acd6ee8f0796af

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