Merge branch 'dev-compose-newwindow'

Thomas Bruederli

2012-10-27 ddafe4e4109a8d6d412c3c138412ee2ca3d58dbf

 program/include/rcube_output.php

@@ -17,9 +17,6 @@
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 | Author: Aleksander Machniak <alec@alec.pl>                            |
 +-----------------------------------------------------------------------+

 $Id$

*/

/**
@@ -47,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();
    }