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)
commite3944841797736dc19a06dd8d4ed927bd76f29b9
treec79b7d0329558d6d1e20a1cfbf18d86a8c8f51ea
parent595d9876bbc9f3a86d2f791419db8888ce9ce113
parentca4e42cfa36c9ce5a3333c0fcf1e46cb0f784e93
Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css