Merge branch 'reject_sender_login_mismatch' into 'master'

Marius Cramer

2015-04-15 85ffd16ba38cf6890d649efa284be8a822ebc25e

1
ALTER TABLE `client` CHANGE `web_php_options` `web_php_options` VARCHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'no,fast-cgi,cgi,mod,suphp,php-fpm';