Merged revisions 3100-3175 from stable branch.

tbrehm

2012-06-07 26c0fc98b880cf148ab348aefef85ac9b087597c

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