Merge branch 'MDL-40770-master' of git://github.com/phalacee/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 21:52:03 +0000 (10:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 21:52:03 +0000 (10:52 +1300)
commit55fcb3504f6203fa5fd214982be80636b16aa760
treee6b4d12ffdd588d1c2d898e74a432783d9515954
parentd1ed736f1de7ae7f28d28dd72733ccb8d2aee6f9
parentae5af113d05f51825f4f5c6f9353cfafada7436c
Merge branch 'MDL-40770-master' of git://github.com/phalacee/moodle
lib/editor/tinymce/lib.php