[commits] Horde branch master updated. 47345385c5cd49bf4951f94c833590f4cab51929

[Jan Schneider]

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

from: 6b896d092d19635430555e823d6a471e9dadcb9b

4734538 [jan] Add reST renderers for blockquote and emphasis.

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

commit 47345385c5cd49bf4951f94c833590f4cab51929
Author: Jan Schneider <jan at horde.org>
Date:   Mon Feb 4 17:43:40 2013 +0100

    [jan] Add reST renderers for blockquote and emphasis.
    
    Conflicts:
    	wicked/package.xml

 wicked/docs/CHANGES                            |    1 +
 wicked/lib/Text_Wiki/Render/Rst/Blockquote.php |   59 ++++++++++++++++++++++++
 wicked/lib/Text_Wiki/Render/Rst/Emphasis.php   |   46 ++++++++++++++++++
 wicked/package.xml                             |   12 +++--
 4 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 wicked/lib/Text_Wiki/Render/Rst/Blockquote.php
 create mode 100644 wicked/lib/Text_Wiki/Render/Rst/Emphasis.php

http://git.horde.org/horde-git/-/commit/47345385c5cd49bf4951f94c833590f4cab51929