[pkg-horde] [SCM] Debian Horde Packages repository: ingo1 package branch, upstream+patches, updated. 9f484a4099acc03a45bc5750644e3ee5647a0a25

[Gregory Colpart]

The following commit has been merged in the upstream+patches branch:
commit 9f484a4099acc03a45bc5750644e3ee5647a0a25
Merge: 6430938ea5eddfdb9afc31b769824e0428edcea1 7d284c5422083519a202784cdcae7acd14494040
Author: Gregory Colpart <gcolpart at ioakim2.evolix.net>
Date:   Sat Jul 10 19:57:34 2010 +0200

    Merge branch 'upstream' into upstream+patches

diff --combined config/prefs.php.dist
index 037fe4f,fe645fb..c92a753
--- a/config/prefs.php.dist
+++ b/config/prefs.php.dist
@@@ -1,12 -1,12 +1,12 @@@
  <?php
  /**
-  * $Horde: ingo/config/prefs.php.dist,v 1.30.10.3 2008-06-15 21:14:38 chuck Exp $
+  * $Horde: ingo/config/prefs.php.dist,v 1.30.10.3 2008/06/15 21:14:38 chuck Exp $
   *
   * See horde/config/prefs.php for documentation on the structure of this file.
   */
  
  // Make sure that INGO_STORAGE_* constants are defined.
 -require_once dirname(__FILE__) . '/../lib/Storage.php';
 +require_once HORDE_BASE . '/ingo/lib/Storage.php';
  
  // This preference group will only be displayed if the configured
  // Ingo_Script:: driver can create script files.

-- 
Debian Horde Packages repository: ingo1 package