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

author Dan Poltawski <dan@moodle.com>

Tue, 6 May 2014 03:48:38 +0000 (11:48 +0800)

committer Dan Poltawski <dan@moodle.com>

Tue, 6 May 2014 03:48:38 +0000 (11:48 +0800)
author Dan Poltawski <dan@moodle.com>
Tue, 6 May 2014 03:48:38 +0000 (11:48 +0800)
committer Dan Poltawski <dan@moodle.com>
Tue, 6 May 2014 03:48:38 +0000 (11:48 +0800)
diff --cc lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js

index 49f60b1,a995bf2..851d740

Binary files differ
diff --cc lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js

index 390e14c,14062ce..8b51ba9

Binary files differ
diff --cc lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js

index 49f60b1,a995bf2..851d740

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