Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 plugins/password/drivers/vpopmaild.php

@@ -19,7 +19,7 @@
        $vpopmaild = new Net_Socket();

        if (PEAR::isError($vpopmaild->connect($rcmail->config->get('password_vpopmaild_host'),
           $rcmail->config->get('password_vpopmaild_port'), null))) {
            $rcmail->config->get('password_vpopmaild_port'), null))) {
            return PASSWORD_CONNECT_ERROR;
        }