Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Oct 2013 10:38:25 +0000 (18:38 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:59:27 +0000 (08:59 +0800)
Conflicts:
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css

1  2 
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css