[commits] Horde branch master updated. 5d5d2e3947baf1246110294632e837b3e48e66fa

[Jan Schneider]

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

from: 305c35e1aee035673efcac69c76f47448221ec0f

b55b1d2 [jan] Fix line breaks of iTip responses when using quoted-printable encoding (Bug #10888).
bb75bf9 Enforce CRLF line endings (Bug #10888).
5d5d2e3 Fix check if there are conflicts to display.

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

commit b55b1d2df29196567bfd512772d6283616448752
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jan 31 20:32:45 2012 +0100

    [jan] Fix line breaks of iTip responses when using quoted-printable encoding (Bug #10888).

 framework/Itip/package.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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

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

commit bb75bf962a321c011fa43431aa728ba225d9c203
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jan 31 20:31:41 2012 +0100

    Enforce CRLF line endings (Bug #10888).

 framework/Itip/lib/Horde/Itip/Response.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

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

commit 5d5d2e3947baf1246110294632e837b3e48e66fa
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jan 31 20:30:47 2012 +0100

    Fix check if there are conflicts to display.

 imp/lib/Mime/Viewer/Itip.php |   49 ++++++++++++++++++++++-------------------
 1 files changed, 26 insertions(+), 23 deletions(-)

http://git.horde.org/horde-git/-/commit/5d5d2e3947baf1246110294632e837b3e48e66fa