[commits] Horde branch imp_6_1 updated. 4ed2ff00101cc9f6559ff1e3a30f234342ccdfbc

[Michael M Slusarz]

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

from: 4f9fe8f70c6d90a4f1ec47b6a972aa852c1e242b

ba6c76d No dom load method in this class
1ed4e5c Fix botched merge
2094f30 this needs to be a string
4ed2ff0 Fix function name

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

commit ba6c76d3ce580e51df7729a32dc2c7f045092e53
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 7 13:03:12 2013 -0600

    No dom load method in this class

 imp/js/folderprefs.js |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

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

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

commit 1ed4e5c3e82f2cd7f349d61f61c960454f3d48a5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Apr 7 13:04:16 2013 -0600

    Fix botched merge

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

http://git.horde.org/horde-git/-/commit/1ed4e5c3e82f2cd7f349d61f61c960454f3d48a5

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

commit 2094f307c05534d3a9de976fa935dea958fc120c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 8 00:42:25 2013 -0600

    this needs to be a string

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

http://git.horde.org/horde-git/-/commit/2094f307c05534d3a9de976fa935dea958fc120c

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

commit 4ed2ff00101cc9f6559ff1e3a30f234342ccdfbc
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Apr 8 00:47:02 2013 -0600

    Fix function name

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

http://git.horde.org/horde-git/-/commit/4ed2ff00101cc9f6559ff1e3a30f234342ccdfbc