Merge branch 'MDL-41241-master-fix3' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 3 Oct 2013 03:03:22 +0000 (16:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 3 Oct 2013 03:03:22 +0000 (16:03 +1300)
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

1  2 
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/editor.js