Merge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Apr 2014 06:51:42 +0000 (14:51 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Apr 2014 06:51:42 +0000 (14:51 +0800)
commite5d3f6ea262f835fa4c29e5394c8f0f0e3c13eb4
tree59e0f29a62b1a2565f33c9bc5ed6ebe645f4d357
parent0adadbf00bcc9c9f7e2b90730ac766c936c4243a
parent5e543b4f7671545cb8e489e48282255bdc329465
Merge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/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/toolbar-keyboardnav.js