Merge remote-tracking branch 'florian030/master'

Marius Cramer

2014-04-10 58964a90d06f523f991a67bd1068e1f504d1f8a9

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