From 9f0ca2dca669a3f379d8582f128b7cca7056a921 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 18 Oct 2012 06:14:02 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 program/include/rcube_output.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/include/rcube_output.php b/program/include/rcube_output.php
index 9aa7c9e..5c582e6 100644
--- a/program/include/rcube_output.php
+++ b/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();
     }

--
Gitblit v1.9.1