[commits] Horde branch master updated. 325cc596848431baa8e7709408ed0cbf6abf064d

[Jan Schneider]

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

from: 985e26a0395d068033b081668ef545e06c36fa42

1e129d6 Button style.
43e4f44 Add line breaks after lists.
0c45a28 Workaround broken Heading parser.
7998831 [jan] Work around broken Text_Wiki header parser.
325cc59 Wrong version.

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

commit 1e129d6c41f677c7172d96632b1c59f0ad11a650
Author: Jan Schneider <jan at horde.org>
Date:   Thu Apr 4 11:07:25 2013 +0200

    Button style.

 mnemo/templates/memo/memo.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit 43e4f44ba36d4bee2bcdf4fc49771a368de71fef
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/43e4f44ba36d4bee2bcdf4fc49771a368de71fef

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

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

    Workaround broken Heading parser.

 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/0c45a28c3f4d9131daa28d594bddcd23b6324ac4

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

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

    [jan] Work around broken Text_Wiki header parser.
    
    Conflicts:
    	wicked/package.xml

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

http://git.horde.org/horde-git/-/commit/79988310c0656982b7e05b275c6334a42ff99005

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

commit 325cc596848431baa8e7709408ed0cbf6abf064d
Author: Jan Schneider <jan at horde.org>
Date:   Thu Apr 4 13:29:03 2013 +0200

    Wrong version.

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

http://git.horde.org/horde-git/-/commit/325cc596848431baa8e7709408ed0cbf6abf064d