Merge branch 'MDL-45254-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 03:53:28 +0000 (11:53 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 1 May 2014 03:53:28 +0000 (11:53 +0800)
commit9482292af2472282891000f2e9c5d0c6735cea03
treef25af62e525aa7e605e66340cbc9bc6e1cc31890
parenta608d3f40b68c0afc9745f9f0d22c447b52f867e
parentd926ce71739300fc15ee232673467e72608ad3e4
Merge branch 'MDL-45254-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-debug.js
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button.js
lib/editor/atto/plugins/equation/yui/src/button/js/button.js