[commits] Horde branch master updated. 7c4e25ec5cdc74a4c2619e4f836e2fe7f0e0ec80

[Michael M Slusarz]

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

from: ee428131f034192884b7bb8ef6849bbfba1d8be7

7581148 Catch case where iterator does not contain any children
6a38edd Arguments to array_merge() must be arrays
7c4e25e Bug #9692: Fix upgrading virtual folders from IMP 4

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

commit 75811485b4b97a21e20185c7c2dd622d748a5eec
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Mar 22 11:01:38 2011 -0600

    Catch case where iterator does not contain any children

 imp/lib/Imap/Tree.php |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/75811485b4b97a21e20185c7c2dd622d748a5eec

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

commit 6a38edda5714970d15e4439216583500e069b66c
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Mar 22 11:01:54 2011 -0600

    Arguments to array_merge() must be arrays

 imp/lib/Mailbox.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/6a38edda5714970d15e4439216583500e069b66c

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

commit 7c4e25ec5cdc74a4c2619e4f836e2fe7f0e0ec80
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Mar 22 11:45:57 2011 -0600

    Bug #9692: Fix upgrading virtual folders from IMP 4

 imp/docs/CHANGES   |    1 +
 imp/lib/Search.php |   76 ++++++++++++++++++++-------------------------------
 imp/package.xml    |    5 +++-
 3 files changed, 35 insertions(+), 47 deletions(-)

http://git.horde.org/horde-git/-/commit/7c4e25ec5cdc74a4c2619e4f836e2fe7f0e0ec80