Merge branch 'MDL-45254-master' of git://github.com/andrewnicols/moodle

author Dan Poltawski <dan@moodle.com>

Thu, 1 May 2014 03:53:28 +0000 (11:53 +0800)

committer Dan Poltawski <dan@moodle.com>

Thu, 1 May 2014 03:53:28 +0000 (11:53 +0800)
author Dan Poltawski <dan@moodle.com>
Thu, 1 May 2014 03:53:28 +0000 (11:53 +0800)
committer Dan Poltawski <dan@moodle.com>
Thu, 1 May 2014 03:53:28 +0000 (11:53 +0800)
diff --cc lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-debug.js

index 94ee74f,c906f26..84a79fc

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

index 6fe95b6,ce06311..d0ae9e8

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

index 3ed77a9,0f3affd..4eb4dc7

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