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

Thomas Bruederli

2012-12-13 f7136bd21705d8a9edd1110f8bf91dca759d2fb3

 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;
    }