[pkg-horde] [SCM] Debian Horde Packages repository: imp4 package branch, upstream+patches, updated. d5df07643896110995f6581a6ef1b00bcc2e5f40

[Mathieu Parent]

The following commit has been merged in the upstream+patches branch:
commit d5df07643896110995f6581a6ef1b00bcc2e5f40
Merge: 57d0ea611cb935c3780eaa389e6c77c5e8ed263d 33390ca6ce7639c6de0276966b83570cdfb076fa
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sun Dec 20 17:04:29 2009 +0100

    Merge branch 'upstream' into upstream+patches
    
    Conflicts:
    	js/builder.js
    	js/controls.js
    	js/dragdrop.js
    	js/effects.js
    	js/prototype.js
    	js/scriptaculous.js
    	js/slider.js
    	js/src/prototype.js

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