Merge branch 'master' into 'master'

Marius Cramer

2015-06-22 5b3c29178704c047d4020df2ae445ff01c6e1f3a

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