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

Aleksander Machniak

2013-09-20 b334a01791689a16c8d6b10955df850b891ff40e

 plugins/password/drivers/virtualmin.php

@@ -48,10 +48,6 @@
            $pieces = explode("_", $username);
            $domain = $pieces[0];
            break;
        case 8: // domain taken from alias, username left as it was
            $email = $rcmail->user->data['alias'];
            $domain = substr(strrchr($email, "@"), 1);
            break;
        default: // username@domain
            $domain = substr(strrchr($username, "@"), 1);
        }