Merge branch 'convert_to_reseller' into 'master'

Marius Cramer

2014-08-14 c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7

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