Merge branch 'w10_MDL-31785_m23_htmlpurifier' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2012 12:01:39 +0000 (13:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2012 12:01:39 +0000 (13:01 +0100)

Trivial merge