[commits] Horde branch master updated. c9274cd01b407ed251d4a130943ef146e71278d1

[Michael M Slusarz]

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

from: 4ce4bd7ed6f607a2bd875d90ddfdc585cedb30b0

c9274cd [mms] Fix merging config data (Bug #10381).

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

commit c9274cd01b407ed251d4a130943ef146e71278d1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 15 23:22:57 2011 -0700

    [mms] Fix merging config data (Bug #10381).

 framework/Core/lib/Horde/Registry.php            |   28 +++++-
 framework/Core/package.xml                       |    2 +-
 framework/Core/test/Horde/Core/RegistryTest.php  |  111 ++++++++++++++++++++++
 framework/Core/test/Horde/Core/Stub/Registry.php |   45 +++++++++
 4 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 framework/Core/test/Horde/Core/RegistryTest.php
 create mode 100644 framework/Core/test/Horde/Core/Stub/Registry.php

http://git.horde.org/horde-git/-/commit/c9274cd01b407ed251d4a130943ef146e71278d1