[commits] Horde branch develop updated. 58e55b401e4a9b98e483b7dc3f110398685eb185

[Michael M Slusarz]

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

from: a6ba622df19c31bb240fe956b0e28223829ad256

12a0913 Revert "List alarms must return an array for the code in Horde_Core_Factory_Alarm:: to work correctly."
58e55b4 This got accidentally moved.

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

commit 12a0913dcdd078f22aa8406e6b0417c22594b10b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 3 15:27:42 2012 -0700

    Revert "List alarms must return an array for the code in Horde_Core_Factory_Alarm:: to work correctly."
    
    This reverts commit 1260f93454f515d6164a11d7e260519dfa791d98.
    
    Correct fix.  Returning array(false) is awkward.  Keep return values as
    simple as possible.

 framework/Core/lib/Horde/Core/Factory/Alarm.php   |    4 ++--
 framework/Core/lib/Horde/Registry/Application.php |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/12a0913dcdd078f22aa8406e6b0417c22594b10b

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

commit 58e55b401e4a9b98e483b7dc3f110398685eb185
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Feb 3 15:42:56 2012 -0700

    This got accidentally moved.

 imp/config/conf.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/58e55b401e4a9b98e483b7dc3f110398685eb185