Merge branch 'reject_sender_login_mismatch' into mdbox-format

Dominik

2015-04-25 afe87b044dc20ceb104b31213543c14b562facd7

1
ALTER TABLE `web_domain` ADD COLUMN `enable_spdy` ENUM('y','n') NULL DEFAULT 'n' AFTER `proxy_directives`;