Merge branch 'MDL-42352_editpdf_scrolling' of git://github.com/davosmith/moodle

author Dan Poltawski <dan@moodle.com>

Thu, 31 Oct 2013 03:27:49 +0000 (11:27 +0800)

committer Sam Hemelryk <sam@moodle.com>

Fri, 1 Nov 2013 00:56:53 +0000 (08:56 +0800)
author Dan Poltawski <dan@moodle.com>
Thu, 31 Oct 2013 03:27:49 +0000 (11:27 +0800)
committer Sam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:56:53 +0000 (08:56 +0800)
diff --cc mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js

index fa2c392,7fc1ae5..1939e64

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

index 5dbd8ac,140ecf1..32fa3bd

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

index fa2c392,7fc1ae5..1939e64

Binary files differ
diff --cc mod/assign/feedback/editpdf/yui/src/editor/js/editor.js
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Thu, 31 Oct 2013 03:27:49 +0000 (11:27 +0800)
committer	Sam Hemelryk <sam@moodle.com>
	Fri, 1 Nov 2013 00:56:53 +0000 (08:56 +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