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)
1  2 
lib/editor/tinymce/lib.php

Simple merge