Merge branch 'reject_sender_login_mismatch' into 'master'

Marius Cramer

2015-04-15 85ffd16ba38cf6890d649efa284be8a822ebc25e

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