Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 04:04:41 +0000 (12:04 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 8 Apr 2014 04:04:41 +0000 (12:04 +0800)
commit9a59ebaa6cdae3543d3a278da4abdbdf90180a7c
tree712ab21926623a491151349c892d8bb0b408f795
parenta0c2ac6b86c9e48c213c1df81284fe072aed2975
parent0a1456dfa857696251a608e8477852b5ee35eb23
Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-debug.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin.js
lib/editor/atto/yui/src/editor/js/editor-plugin-buttons.js
lib/editor/atto/yui/src/editor/js/editor-plugin.js