Merge branch 'w33_MDL-34741_m24_yui2in3' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 07:33:10 +0000 (15:33 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Aug 2012 07:33:10 +0000 (15:33 +0800)
1  2 
lib/editor/tinymce/module.js
lib/thirdpartylibs.xml

Simple merge
Simple merge