[commits] Horde branch develop updated. 2ebcdb118ec14f9206a842a490fecf9f400db24f

[Michael M Slusarz]

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

from: 9417ce93f036dc0509ccd65d02aca1a560f930f5

88aeae5 Correct fix for prefs reloading.
cf13f29 IMP now requires PHP 5.3.0+
2ebcdb1 Merge branch 'master' into develop

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

commit 88aeae52cc6a990944775efab11e0fa7f4a6e6f3
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 12 14:53:08 2012 -0600

    Correct fix for prefs reloading.
    
    We want to make sure that loadPrefs() is never called with a null
    argument, or else we will try to load Prefs from the 'null' scope.

 framework/Core/lib/Horde/Registry.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/88aeae52cc6a990944775efab11e0fa7f4a6e6f3

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

commit cf13f29f7b70b834ceb1497b2572d757ba430a6c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 12 15:02:56 2012 -0600

    IMP now requires PHP 5.3.0+

 imp/lib/Search/Query.php |    3 +--
 imp/package.xml          |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

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

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

commit 2ebcdb118ec14f9206a842a490fecf9f400db24f
Merge: cf13f29 88aeae5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Mar 12 15:12:20 2012 -0600

    Merge branch 'master' into develop

 framework/Core/lib/Horde/Registry.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/2ebcdb118ec14f9206a842a490fecf9f400db24f