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

prashant

2015-06-23 521bea4bd8f2e462df3cf79fa5f2230a00e1115c

 program/lib/Roundcube/rcube_html2text.php

@@ -216,7 +216,7 @@
     * @see $ent_search
     */
    protected $ent_replace = array(
        ' ',                                    // Non-breaking space
        "\xC2\xA0",                             // Non-breaking space
        '"',                                    // Double quotes
        "'",                                    // Single quotes
        '>',
@@ -520,6 +520,11 @@
            return $display;
        }

        // skip links with href == content (#1490434)
        if ($link === $display) {
            return $display;
        }

        if (preg_match('!^([a-z][a-z0-9.+-]+:)!i', $link)) {
            $url = $link;
        }