[commits] Horde branch develop updated. 789922dd1cfb7e88cad6a0145352562e9b67d83c

[Michael M Slusarz]

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

from: 36e555493bbf31faa3c8d7aca89905cf18a6f7ae

edd13b6 If there is a BOM, than at the beginning of the complete data set, not after leading whitespace or inside a component.
3e63def And it's Horde_String, not Horde_Util.
1a38e45 Cleaner implementation of spam/innocent email reporting format config option
789922d Merge branch 'master' into develop

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

commit edd13b6b2f941bfdb7c543e133f049f4bc6c3147
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 5 22:53:31 2012 +0200

    If there is a BOM, than at the beginning of the complete data set, not after leading whitespace or inside a component.

 framework/Icalendar/lib/Horde/Icalendar.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

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

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

commit 3e63defe6c930bf846ec3065b6dfe1778cbb030e
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jun 6 10:06:39 2012 +0200

    And it's Horde_String, not Horde_Util.

 framework/Icalendar/lib/Horde/Icalendar.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/3e63defe6c930bf846ec3065b6dfe1778cbb030e

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

commit 1a38e45e9599f2909949a507bb581d1fa5f95050
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Jun 5 14:32:34 2012 -0600

    Cleaner implementation of spam/innocent email reporting format config option

 imp/config/conf.xml |   46 ++++++++++++++++++++++++++--------------------
 imp/docs/UPGRADING  |   11 +++++++++++
 imp/lib/Spam.php    |   37 +++++++++++++++++++++++--------------
 3 files changed, 60 insertions(+), 34 deletions(-)

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

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

commit 789922dd1cfb7e88cad6a0145352562e9b67d83c
Merge: 36e5554 1a38e45
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Jun 6 14:55:15 2012 -0600

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/config/conf.xml
    	imp/docs/UPGRADING
    	imp/lib/Spam.php

 framework/Icalendar/lib/Horde/Icalendar.php |    4 ++-
 imp/config/conf.xml                         |   46 +++++++++++++++-----------
 imp/docs/UPGRADING                          |   11 ++++++
 imp/lib/Spam.php                            |   37 +++++++++++++--------
 4 files changed, 63 insertions(+), 35 deletions(-)

http://git.horde.org/horde-git/-/commit/789922dd1cfb7e88cad6a0145352562e9b67d83c