Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2014-11-27 b553b2bf146cf20bd3ddfeba52ec5cc5b70a1da9

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