Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2014-05-16 dc563fadd85712628bc6003da5da72b4d7e2f591

 plugins/password/drivers/vpopmaild.php

@@ -22,6 +22,8 @@
            $rcmail->config->get('password_vpopmaild_port'), null))) {
            return PASSWORD_CONNECT_ERROR;
        }
	
        $vpopmaild->setTimeout($rcmail->config->get('password_vpopmaild_timeout'),0);

        $result = $vpopmaild->readLine();
        if(!preg_match('/^\+OK/', $result)) {