Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-04-04 36420c614b259a0ca1aa7db14b1215db60c4c5ce

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