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)
commit5ee0b3ceaf91f75d94af5b391cb9ecd855c8ec8e
tree2b5d3562d1dee24376c20c7ece61e57d9bfc1bcf
parentd69f584fe6841d9e3213df4536cf316a101ce681
parent3a6511a530015813f7bfda5547f8fc9de750efcf
Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle

Conflicts:
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-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