Merge branch 'master' into 'master'

Marius Cramer

2014-03-07 bed72531bfb1ca225bb2c009dfbacf8f09fcd128

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