Merge branch 'MDL-27887' of git://github.com/timhunt/moodle
commitff30976ad542d3b8be8a1111546f6a4dfdf81d32
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Jun 2011 14:16:58 +0000 (17 16:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 17 Jun 2011 14:16:58 +0000 (17 16:16 +0200)
treef32a1e6b0cb6876056a9bd877880cb7688030328
parent5df6b3c87e780baf236fa234b510e169f484a335
parenta8c86418020e3eee29c40a74fec876db15d7e4bd
Merge branch 'MDL-27887' of git://github.com/timhunt/moodle
lib/editor/tinymce/lib.php