[pkg-horde] [SCM] Debian Horde Packages repository: ansel1 package branch, debian-sid, updated. debian/1.0+debian0-1-7-gce86948

[Mathieu Parent]

The following commit has been merged in the debian-sid branch:
commit ce86948fbfccba5aaaaced3975b4391baeb3bff0
Merge: 7294a3fcfa1903c8d9951a04a81037fe7a27f9f5 5b87b825da3310c64ef2573af21833961c2595cc
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Fri Dec 18 13:48:48 2009 +0100

    Merge branch 'upstream+repack' into debian-sid

diff --combined config/prefs.php.dist
index a218328,74d832f..d481064
--- a/config/prefs.php.dist
+++ b/config/prefs.php.dist
@@@ -1,12 -1,12 +1,12 @@@
  <?php
  /**
-  * $Horde: ansel/config/prefs.php.dist,v 1.68.2.5 2009/01/26 17:32:45 mrubinsk Exp $
+  * $Horde: ansel/config/prefs.php.dist,v 1.68.2.5 2009-01-26 17:32:45 mrubinsk Exp $
   *
   * See horde/config/prefs.php for documentation on the structure of this file.
   */
  
  // Make sure that constants are defined.
 -require_once dirname(__FILE__) . '/../lib/Ansel.php';
 +require_once HORDE_BASE . '/ansel/lib/Ansel.php';
  
  $prefGroups['display'] = array(
      'column' => _("General Options"),

-- 
Debian Horde Packages repository: ansel1 package