Merged revisions 3670-3683 from 3.0.5 stable branch.

tbrehm

2012-11-20 68ec43740a49be874d629f4d2e9be9787c3ae2ea

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