Merge branch 'MDL-58349-master' of git://github.com/damyon/moodle

diff --cc mod/assign/feedback/editpdf/styles.css
Simple merge

diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
index 9e69f88,e89b036..8850f0d
Binary files differ

diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
index f6ba2d3,76b8c8b..fb67e86
Binary files differ

diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
index 9e69f88,e89b036..8850f0d
Binary files differ

diff --cc mod/assign/feedback/editpdf/yui/src/editor/js/commentsearch.js
Simple merge