Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 09:34:04 +0000 (10:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jan 2013 09:34:04 +0000 (10:34 +0100)
commitcf78070a637cedf6a0166e73dbc7869c163565e5
treed28a10640a59fe2408f3a68e0c5a0e7a8ad93de3
parentb315a452742e1623682237b1ae7e94062fa9a3e9
parent23ac6ef6c537ae27308be8c830a6ffacea044923
Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle
lib/editor/tinymce/lib.php