From 928cb3401bfb70b6a48fe60b198b672b4062f23a Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 27 Nov 2012 09:02:24 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

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

diff --git a/program/lib/Roundcube/rcube_output.php b/program/lib/Roundcube/rcube_output.php
index ca8d83e..4ef42f5 100644
--- a/program/lib/Roundcube/rcube_output.php
+++ b/program/lib/Roundcube/rcube_output.php
@@ -31,7 +31,7 @@
 
     protected $app;
     protected $config;
-    protected $charset = RCMAIL_CHARSET;
+    protected $charset = RCUBE_CHARSET;
     protected $env = array();
 
 

--
Gitblit v1.9.1