From efe3b62084480b62caf2f01647803b38ed3f3c20 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 21 May 2013 03:27:03 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 config/main.inc.php.dist |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 05afed9..da5c5f3 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -892,5 +892,3 @@
 
 // Enables display of email address with name instead of a name (and address in title)
 $rcmail_config['message_show_email'] = false;
-
-// end of config file

--
Gitblit v1.9.1