Merge branch 'MDL-49564-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 18:25:10 +0000 (19:25 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 18:25:10 +0000 (19:25 +0100)
commit3d8b835aec37ab306188f030702a6a74a8ccb297
tree9fc6ffd52f0d859420d1641dbea2f15ff0f0b4d1
parentf5c493f75e9ef3c1e31eefab167f3e0dc1753c05
parent1b6ce030d35b85ce96ca68ebdbd92e1c208f331d
Merge branch 'MDL-49564-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