Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 plugins/managesieve/tests/Tokenizer.php

@@ -5,7 +5,7 @@

    function setUp()
    {
        include_once dirname(__FILE__) . '/../lib/rcube_sieve_script.php';
        include_once dirname(__FILE__) . '/../lib/Roundcube/rcube_sieve_script.php';
    }

    function data_tokenizer()