[commits] Horde branch master updated. faaabc83887b2f25e39c6b9fdcb4f221c1fa1f58

[Jan Schneider]

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

from: 7a571b8b29b7cf961738cc7a6971d5b6f3f9092a

a5a1b24 Fixed inline renderer destroying newlines
7e8e90a Tests for a5a1b24
82a4cf3 Merge branch 'master' of git://github.com/petrkalivoda/horde into petrkalivoda-master
faaabc8 Merge branch 'petrkalivoda-master'

Summary: http://github.com/horde/horde/compare/7a571b8b29b7cf961738cc7a6971d5b6f3f9092a...faaabc83887b2f25e39c6b9fdcb4f221c1fa1f58

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

commit a5a1b2452b8a084a93393fce17f09009d838e736
Author: Petr Kalivoda <petr.kalivoda at gmail.com>
Date:   Wed Jun 11 14:09:33 2014 +0200

    Fixed inline renderer destroying newlines

 framework/Text_Diff/lib/Horde/Text/Diff/Renderer/Inline.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/a5a1b2452b8a084a93393fce17f09009d838e736

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

commit 7e8e90aaa64652366d0a950510bb493af29ef88e
Author: Petr Kalivoda <petr.kalivoda at gmail.com>
Date:   Wed Jun 11 16:25:28 2014 +0200

    Tests for a5a1b24

 framework/Text_Diff/test/Horde/Text/Diff/RendererTest.php |   22 +++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/7e8e90aaa64652366d0a950510bb493af29ef88e

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

commit 82a4cf3e46509f2b46dfec24434d132da0ab9bea
Merge: 7a571b8 7e8e90a
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jun 11 18:04:34 2014 +0200

    Merge branch 'master' of git://github.com/petrkalivoda/horde into petrkalivoda-master

 framework/Text_Diff/lib/Horde/Text/Diff/Renderer/Inline.php |    4 +-
 framework/Text_Diff/test/Horde/Text/Diff/RendererTest.php   |   22 +++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/82a4cf3e46509f2b46dfec24434d132da0ab9bea

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

commit faaabc83887b2f25e39c6b9fdcb4f221c1fa1f58
Merge: 7a571b8 82a4cf3
Author: Jan Schneider <jan at horde.org>
Date:   Wed Jun 11 18:06:03 2014 +0200

    Merge branch 'petrkalivoda-master'

 framework/Text_Diff/lib/Horde/Text/Diff/Renderer/Inline.php |    4 +-
 framework/Text_Diff/test/Horde/Text/Diff/RendererTest.php   |   22 +++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/faaabc83887b2f25e39c6b9fdcb4f221c1fa1f58