[pkg-horde] [SCM] Debian Horde Packages repository: imp4 package branch, debian-sid, updated. 3af9f912b5d6fd99f4293434141851f0675e2f9e

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit 700d713457584b609f244b348415b64692a457bd
Merge: 03bc0801031a2b72ecce40c5f4ad8c1c8c664af6 8c4530c3eee77b22c804e91b1e097bb87c7613a7
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 20 17:08:23 2009 +0100

    Merge branch 'upstream+repack' into debian-sid

diff --combined config/servers.php.dist
index 08296b2,1a36d43..579f101
--- a/config/servers.php.dist
+++ b/config/servers.php.dist
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  /**
-  * $Horde: imp/config/servers.php.dist,v 1.50.2.23 2008/07/03 13:06:15 jan Exp $
+  * $Horde: imp/config/servers.php.dist,v 1.50.2.23 2008-07-03 13:06:15 jan Exp $
   *
   * This file is where you specify what mail servers people using your
   * installation of IMP can log in to.
@@@ -301,9 -301,6 +301,9 @@@ $servers['exchange'] = array
  );
  
  if ($GLOBALS['conf']['kolab']['enabled']) {
 +    // When using Kolab, other mail servers are removed
 +    $servers = Array();
 +    
      require_once 'Horde/Kolab.php';
  
      if (!is_callable('Kolab', 'getServer')) {

-- 
Debian Horde Packages repository: imp4 package