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

Trivial merge