Merge branch 'develop' into 'master'

Falko Timme

2014-12-13 39fab06dfae1e0218a1bb3aa48a381586dfaea6d

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