[commits] Horde branch FRAMEWORK_4 updated. bb547265e552dd95da5b7f51c04140010bef863b

[Jan Schneider]

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

from: 8cfc7af29d9df8e633e498043680e8dd8d87772f

aa9c7dd Add line breaks after lists.
837b69b Workaround broken Heading parser.
bb54726 [jan] Work around broken Text_Wiki header parser.

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

commit aa9c7dd044f24c4843a0d9f837c390aee6733393
Author: Jan Schneider <jan at horde.org>
Date:   Thu Apr 4 12:20:30 2013 +0200

    Add line breaks after lists.

 wicked/lib/Text_Wiki/Render/Rst/List.php |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

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

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

commit 837b69b51f9ef8b98955e247ab53fc6657b8cb8b
Author: Jan Schneider <jan at horde.org>
Date:   Thu Apr 4 13:20:52 2013 +0200

    Workaround broken Heading parser.
    
    Conflicts:
    	wicked/lib/Page.php

 wicked/lib/Page.php                             |   34 ++++++--
 wicked/lib/Text_Wiki/Parse/Default/Heading2.php |   16 ++++
 wicked/lib/Text_Wiki/Render/Latex/Heading2.php  |    7 ++
 wicked/lib/Text_Wiki/Render/Plain/Heading2.php  |    7 ++
 wicked/lib/Text_Wiki/Render/Rst/Heading.php     |  103 -----------------------
 wicked/lib/Text_Wiki/Render/Rst/Heading2.php    |  103 +++++++++++++++++++++++
 wicked/lib/Text_Wiki/Render/Xhtml/Heading2.php  |    7 ++
 wicked/package.xml                              |   22 ++++-
 8 files changed, 185 insertions(+), 114 deletions(-)
 create mode 100644 wicked/lib/Text_Wiki/Parse/Default/Heading2.php
 create mode 100644 wicked/lib/Text_Wiki/Render/Latex/Heading2.php
 create mode 100644 wicked/lib/Text_Wiki/Render/Plain/Heading2.php
 delete mode 100644 wicked/lib/Text_Wiki/Render/Rst/Heading.php
 create mode 100644 wicked/lib/Text_Wiki/Render/Rst/Heading2.php
 create mode 100644 wicked/lib/Text_Wiki/Render/Xhtml/Heading2.php

http://git.horde.org/horde-git/-/commit/837b69b51f9ef8b98955e247ab53fc6657b8cb8b

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

commit bb547265e552dd95da5b7f51c04140010bef863b
Author: Jan Schneider <jan at horde.org>
Date:   Thu Apr 4 13:26:25 2013 +0200

    [jan] Work around broken Text_Wiki header parser.

 wicked/docs/CHANGES |    1 +
 wicked/package.xml  |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

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