[commits] Horde branch master updated. 56c47b637493b845489d4a1a2bf61c8fc297f32f

[Michael M Slusarz]

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

from: fe396cabd4ecda4cb65ee4b065a25a769a8f7dc3

9174030 Label on Delete all subfolders
6724968 Add resource limit configuration for digest spam/innocent reporting
2c80c52 Move AND/OR charset conversion
56c47b6 charset can be null here

Summary: http://github.com/horde/horde/compare/fe396cabd4ecda4cb65ee4b065a25a769a8f7dc3...56c47b637493b845489d4a1a2bf61c8fc297f32f

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

commit 917403059f8ba6693046c2d1baa6b1a281ef39ca
Author: João Machado <geral at jpaulo.eu>
Date:   Thu May 7 11:28:29 2015 +0100

    Label on Delete all subfolders
    
    Signed-off-by: Michael M Slusarz <slusarz at horde.org>

 imp/templates/dynamic/mailbox.html.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/917403059f8ba6693046c2d1baa6b1a281ef39ca

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

commit 6724968ed982f9e038ae7811b12045963fc377db
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu May 7 21:35:35 2015 -0600

    Add resource limit configuration for digest spam/innocent reporting

 imp/config/backends.php  |   18 +++++
 imp/docs/UPGRADING       |    3 +
 imp/lib/Factory/Spam.php |    6 ++-
 imp/lib/Imap/Config.php  |   16 +++--
 imp/lib/Spam/Email.php   |  155 +++++++++++++++++++++++++++++++++-------------
 5 files changed, 148 insertions(+), 50 deletions(-)

http://github.com/horde/horde/commit/6724968ed982f9e038ae7811b12045963fc377db

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

commit 2c80c526c9f0423b441d310214d799a361e0b457
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu May 7 22:15:48 2015 -0600

    Move AND/OR charset conversion
    
    We need to honor the $convert parameter.

 framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/2c80c526c9f0423b441d310214d799a361e0b457

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

commit 56c47b637493b845489d4a1a2bf61c8fc297f32f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu May 7 22:20:18 2015 -0600

    charset can be null here

 framework/Imap_Client/lib/Horde/Imap/Client/Search/Query.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/56c47b637493b845489d4a1a2bf61c8fc297f32f