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

Aleksander Machniak

2012-12-11 876f4ebc603ff3c654e44f9bf472ab9164977e20

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

 program/include/rcmail_output_html.php

@@ -670,7 +670,10 @@
     */
    public function just_parse($input)
    {
        return $this->parse_xml($input);
        $input = $this->parse_conditions($input);
        $input = $this->parse_xml($input);

        return $input;
    }