Merge branch 'master_fixes' into 'master'

Dominik

2014-02-26 5a2985f97fb4ef24085722957b3a5e53bfa38949

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