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

author Dan Poltawski <dan@moodle.com>

Tue, 29 Oct 2013 06:43:02 +0000 (14:43 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 29 Oct 2013 06:43:02 +0000 (14:43 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:43:02 +0000 (14:43 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:43:02 +0000 (14:43 +0800)
diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js

index ef4dff0,4f996e6..fa2c392

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

index b2fc17b,dca07a7..5dbd8ac

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

index ef4dff0,4f996e6..fa2c392

Binary files differ
diff --cc mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 29 Oct 2013 06:43:02 +0000 (14:43 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 29 Oct 2013 06:43:02 +0000 (14:43 +0800)
		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-min.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/editor.js	patch \|	diff1 \|	diff2 \|	blob \| history