Merge branch 'MDL-46746-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 11:04:04 +0000 (11:04 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 11:04:04 +0000 (11:04 +0000)
commitdb8a3b2eb90fe909037cb6892c88a99f25a66224
tree5ef33a13c385a7f5ff44a2f7980b35ccdda80695
parent37ccb211fa6b2c998bdc4592b075411703022d66
parentdf7a9fd4ba7badfa1d2f4953a5d030f06e1ae652
Merge branch 'MDL-46746-master' of git://github.com/merrill-oakland/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
lib/editor/atto/yui/src/editor/js/clean.js