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

Simple merge