Merge branch 'w11_MDL-31805_m23_html2text' of git://github.com/skodak/moodle
commit89a47fcc4eea626cec2fafe52b676f99f793bd75
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 17:04:55 +0000 (12 18:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2012 17:04:55 +0000 (12 18:04 +0100)
treefb02483f41253ee5a848cf19f26511a266d40f7a
parentf0131f57d91edbbd4edb830fd5656cb5c7271d03
parentb226ef619f11ba291d9484b04624150d07ceff6b
Merge branch 'w11_MDL-31805_m23_html2text' of git://github.com/skodak/moodle