[commits] Horde branch master updated. e9643a02ba31ad1c81cf6ff5ad3b7e68cc7a4da9

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: 26dfe1d2eef0e3ca0651735b927dbb2eb7458a7e

65eb2e9 Add option to disable LDAP configuration.
e9643a0 Use configldap for prefs (untested).

-----------------------------------------------------------------------

commit 65eb2e97b7b5da9a5d102519f3bb442a96fb8937
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jul 6 00:16:49 2010 +0200

    Add option to disable LDAP configuration.

 framework/Core/lib/Horde/Config.php |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Config.php?rt=horde-git&r1=d61b29e41105995ec9910f270c46d023351cc97f&r2=65eb2e97b7b5da9a5d102519f3bb442a96fb8937

-----------------------------------------------------------------------

commit e9643a02ba31ad1c81cf6ff5ad3b7e68cc7a4da9
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jul 6 00:30:17 2010 +0200

    Use configldap for prefs (untested).

 framework/Prefs/lib/Horde/Prefs/Ldap.php |   48 ++++++++++++++---------------
 horde/config/conf.xml                    |   35 ++-------------------
 2 files changed, 27 insertions(+), 56 deletions(-)

http://git.horde.org/diff.php/framework/Prefs/lib/Horde/Prefs/Ldap.php?rt=horde-git&r1=48931b66d305a40c1611128e11959f64b981008e&r2=e9643a02ba31ad1c81cf6ff5ad3b7e68cc7a4da9
http://git.horde.org/diff.php/horde/config/conf.xml?rt=horde-git&r1=102fa1eaf846272744128f3a703cfeedab62c9bb&r2=e9643a02ba31ad1c81cf6ff5ad3b7e68cc7a4da9