[commits] Horde branch develop updated. 037ac0433f0d298de59d3a20cfdff9c601d42db2

[Jan Schneider]

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

from: ee77a6f0fa500986fe6a5d1b29b79c339e8e245c

2c13056 Simplify
b42ad6c [jan] Work around broken messages with multiple address headers.
037ac04 Merge branch 'master' into develop

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

commit 2c13056672a3fbfa31c43b88a28680dc2df90cfd
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 30 11:27:49 2012 +0200

    Simplify

 ingo/lib/Script/Procmail/Recipe.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/2c13056672a3fbfa31c43b88a28680dc2df90cfd

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

commit b42ad6cda0f376227a0ebef0bfb9da93a361672f
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 30 11:29:38 2012 +0200

    [jan] Work around broken messages with multiple address headers.
    
    If a header is supposed to appear only once, but appears more than once, and we
    know that the contents could have been merged into a single header, because
    it's an address field, merge them.

 framework/Mime/lib/Horde/Mime/Headers.php      |   14 ++++++++++----
 framework/Mime/package.xml                     |    2 ++
 framework/Mime/test/Horde/Mime/HeadersTest.php |   19 +++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

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

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

commit 037ac0433f0d298de59d3a20cfdff9c601d42db2
Merge: ee77a6f b42ad6c
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 30 11:39:38 2012 +0200

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Mime/package.xml

 framework/Mime/lib/Horde/Mime/Headers.php      |   14 ++++++++++----
 framework/Mime/package.xml                     |    1 +
 framework/Mime/test/Horde/Mime/HeadersTest.php |   19 +++++++++++++++++++
 ingo/lib/Script/Procmail/Recipe.php            |    2 +-
 4 files changed, 31 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/037ac0433f0d298de59d3a20cfdff9c601d42db2