[commits] Horde branch master updated. 4fd07bb45b3b954cc8aba45ceb4c528c34eed0e3

[Chuck Hagenbuch]

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

from: 18519498e8d95ed261e01738f73ff358c2f8dcf6

4fd07bb Fix cyrsql configuration, rename cyrus host and port parameters to avoid clashing with Horde_Db parameters (Bug #9864).

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

commit 4fd07bb45b3b954cc8aba45ceb4c528c34eed0e3
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Mon Apr 11 00:55:03 2011 -0400

    Fix cyrsql configuration, rename cyrus host and port parameters to avoid clashing with Horde_Db parameters (Bug #9864).

 framework/Core/lib/Horde/Core/Factory/Auth.php |    6 +++---
 framework/Core/package.xml                     |    1 +
 horde/config/conf.xml                          |   12 +++++++++---
 horde/docs/CHANGES                             |    2 ++
 4 files changed, 15 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/4fd07bb45b3b954cc8aba45ceb4c528c34eed0e3