From e8e2e76ed987d911ec878345e88d3c611a4b7b32 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 17 Sep 2012 13:25:57 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

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

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 7e07341..a6661c3 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -78,7 +78,7 @@
 // TCP port used for IMAP connections
 $rcmail_config['default_port'] = 143;
 
-// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
+// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or null to use
 // best server supported one)
 $rcmail_config['imap_auth_type'] = null;
 

--
Gitblit v1.9.1