Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-10-14 466f06a5845e57661092392055999cc0895af5f8

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