Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Mon, 13 Jun 2016 18:05:13 +0000 (20:05 +0200)

committer Dan Poltawski <dan@moodle.com>

Thu, 16 Jun 2016 08:04:04 +0000 (09:04 +0100)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jun 2016 18:05:13 +0000 (20:05 +0200)
committer Dan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:04 +0000 (09:04 +0100)
diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js

index 2c4ef34,c4d943d..d872488

Binary files differ
diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js

index 2c4ef34,c4d943d..d872488

Binary files differ
diff --cc mod/assign/feedback/editpdf/yui/src/editor/js/comment.js
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Mon, 13 Jun 2016 18:05:13 +0000 (20:05 +0200)
committer	Dan Poltawski <dan@moodle.com>
	Thu, 16 Jun 2016 08:04:04 +0000 (09:04 +0100)
		1	2
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js	patch \|	diff1 \|	diff2 \|	blob \| history
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js	patch \|	diff1 \|	diff2 \|	blob \| history
mod/assign/feedback/editpdf/yui/src/editor/js/comment.js	patch \|	diff1 \|	diff2 \|	blob \| history