Merge branch 'w15_MDL-25826_m20_htmlpurifier' of git://github.com/skodak/moodle into...
commit8fa13d155d2b3bd51cbc3689b3c46faafaaf668b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Apr 2011 09:08:23 +0000 (11 11:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Apr 2011 09:08:23 +0000 (11 11:08 +0200)
treebb2c291b8a8e7bcb53d12b55aa8bafec1f1703b2
parent465846f0823dd34370cc36197fef7ac95b9bfca4
parent60aaf1dc7793297363078f58c5cf46f515c7f75c
Merge branch 'w15_MDL-25826_m20_htmlpurifier' of git://github.com/skodak/moodle into MOODLE_20_STABLE