Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 03:02:40 +0000 (15:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Apr 2014 03:02:40 +0000 (15:02 +1200)
Conflicts:
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js

1  2 
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
lib/editor/atto/plugins/table/yui/src/button/js/button.js