Merge https://github.com/roundcube/roundcubemail into crypt_hash_branch

defa

2012-09-05 921408eba600a7dc51271c35480e9114cac5ecec

 tests/MailFunc.php

@@ -8,7 +8,7 @@
class MailFunc extends PHPUnit_Framework_TestCase
{

    function __construct()
    function setUp()
    {
        // simulate environment to successfully include func.inc
        $GLOBALS['RCMAIL'] = $RCMAIL = rcmail::get_instance();