Merge branch 'MDL-49693-master' of git://github.com/merrill-oakland/moodle

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

Thu, 2 Apr 2015 09:05:32 +0000 (11:05 +0200)

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

Thu, 2 Apr 2015 09:05:32 +0000 (11:05 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 09:05:32 +0000 (11:05 +0200)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Apr 2015 09:05:32 +0000 (11:05 +0200)
diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js

index cc261e9,d2a4802..e425c3b

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

index b8276ba,9895363..0b662e0

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

index e8238d0,b4cf4e3..d7e5c09

Binary files differ
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 2 Apr 2015 09:05:32 +0000 (11:05 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 2 Apr 2015 09:05:32 +0000 (11:05 +0200)
		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