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

Thomas Bruederli

2012-10-18 9f0ca2dca669a3f379d8582f128b7cca7056a921

 program/include/rcube_output.php

@@ -44,7 +44,7 @@
     */
    public function __construct($task = null, $framed = false)
    {
        $this->app     = rcmail::get_instance();
        $this->app     = rcube::get_instance();
        $this->config  = $this->app->config;
        $this->browser = new rcube_browser();
    }