Merge branch 'wip-MDL-55183-master' of git://github.com/abgreeve/moodle

author David Monllao <davidm@moodle.com>

Tue, 26 Jul 2016 01:52:51 +0000 (09:52 +0800)

committer David Monllao <davidm@moodle.com>

Tue, 26 Jul 2016 01:52:51 +0000 (09:52 +0800)
author David Monllao <davidm@moodle.com>
Tue, 26 Jul 2016 01:52:51 +0000 (09:52 +0800)
committer David Monllao <davidm@moodle.com>
Tue, 26 Jul 2016 01:52:51 +0000 (09:52 +0800)
diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js

index 542e509,ba4454c..5f1c61a

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

index dd58489,062b1e3..d04e876

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

index 8384b85,977c64b..2ce7c72

Binary files differ
author	David Monllao <davidm@moodle.com>
	Tue, 26 Jul 2016 01:52:51 +0000 (09:52 +0800)
committer	David Monllao <davidm@moodle.com>
	Tue, 26 Jul 2016 01:52:51 +0000 (09:52 +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