[commits] Horde branch imp_6_1 updated. 4992ac91aabc8b0726c4ec25d37809ca193932fe

[Michael M Slusarz]

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

from: 76f040ce51d2a61a89d2ea43b27f9dffb906775a

25aa1a4 [mms] Update virtual folder name in folder tree when editing the label (Bug #12079).
581d81a Bug #12065: This should fix things
e00e269 Fix parameter
deed1fa Bug #12072: Fix edit links for virtual folders in dynamic view in preferences page
4992ac9 Merge branch 'master' into imp_6_1

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

commit 25aa1a4a0b0f0b6492a2f5d9678a5cab49a3de8a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 2 20:07:02 2013 -0700

    [mms] Update virtual folder name in folder tree when editing the label (Bug #12079).

 imp/docs/CHANGES      |    2 ++
 imp/lib/Imap/Tree.php |    5 +++++
 imp/lib/Search.php    |    5 +++++
 imp/package.xml       |    2 ++
 4 files changed, 14 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/25aa1a4a0b0f0b6492a2f5d9678a5cab49a3de8a

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

commit 581d81aeb0885a65436f94399620e8c8c6b261b1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Mar 2 20:22:57 2013 -0700

    Bug #12065: This should fix things

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

http://git.horde.org/horde-git/-/commit/581d81aeb0885a65436f94399620e8c8c6b261b1

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

commit e00e26970d4693b7f447e420010fc107fea6ac90
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 3 12:47:47 2013 -0700

    Fix parameter

 imp/js/dimpbase.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit deed1fa074c17bfce669c532142ce04d6a002e7d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 3 13:09:58 2013 -0700

    Bug #12072: Fix edit links for virtual folders in dynamic view in preferences page

 imp/docs/CHANGES   |    2 +-
 imp/js/dimpbase.js |    8 +++++---
 imp/lib/Search.php |   17 ++++++++++++++++-
 imp/package.xml    |    4 ++--
 4 files changed, 24 insertions(+), 7 deletions(-)

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

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

commit 4992ac91aabc8b0726c4ec25d37809ca193932fe
Merge: 76f040c deed1fa
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Mar 3 13:13:51 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/js/dimpbase.js
    	imp/lib/Search.php
    	imp/package.xml

 imp/docs/CHANGES      |    4 +++-
 imp/js/dimpbase.js    |    8 +++++---
 imp/lib/Imap/Tree.php |   19 +++++++++++--------
 imp/lib/Search.php    |   24 +++++++++++++++++++++++-
 imp/package.xml       |    3 ++-
 5 files changed, 44 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/4992ac91aabc8b0726c4ec25d37809ca193932fe