Merge branch 'fix_initial_ip_select' into 'master'

Marius Cramer

2014-08-22 b4f3f515ba92d74006f1f44f5e97c6625cfd8f43

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