Merge branch 'w33_MDL-33041_m24_tinymceplugins' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 03:58:05 +0000 (11:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 03:58:05 +0000 (11:58 +0800)
commit78145050c62b681b8082419b1a1e775a88e3437e
tree93ad14a1f0fb8099af2381561a5ffc7dbe8c50a8
parent060eaca70edb8fe9b3323aa932d925d3d8a2a003
parent43552bd2c3aa691a3afb07ceb9fc89aa3647a8c1
Merge branch 'w33_MDL-33041_m24_tinymceplugins' of git://github.com/skodak/moodle
lib/moodlelib.php