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

Andy Wermke

2013-04-04 92cd7f34b07e86062f2c024039e3309768b48ce6

 plugins/virtuser_file/virtuser_file.php

@@ -41,7 +41,7 @@
           $arr = preg_split('/\s+/', $r[$i]);

           if (count($arr) > 0 && strpos($arr[0], '@')) {
              $result[] = rcube_idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));
              $result[] = rcube_utils::idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));

              if ($p['first']) {
                  $p['email'] = $result[0];