Merge branch 'MDL-45253-master' of git://github.com/FMCorz/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 6 May 2014 03:34:17 +0000 (11:34 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 6 May 2014 03:34:17 +0000 (11:34 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 6 May 2014 03:34:17 +0000 (11:34 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 6 May 2014 03:34:17 +0000 (11:34 +0800)
diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js

index 8be91fb,e5893bc..f44f15e

Binary files differ
diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

index 84ba1b4,f2580f6..7901a74

Binary files differ
diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js

index 9c54de3,b05c185..00cf4e4

Binary files differ
diff --cc lib/editor/atto/yui/src/editor/js/selection.js
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 6 May 2014 03:34:17 +0000 (11:34 +0800)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 6 May 2014 03:34:17 +0000 (11:34 +0800)
		1	2
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/editor/atto/yui/src/editor/js/selection.js	patch \|	diff1 \|	diff2 \|	blob \| history