Merge branch 'MDL-41241-master-fix3' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 3 Oct 2013 03:03:22 +0000 (16:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 3 Oct 2013 03:03:22 +0000 (16:03 +1300)
commit322ca2fc66d95320f975bbf3209a6f6dc2c14948
tree9d80c85a244a72ced04bb368bb2529428bab2a09
parentdc48715eb71ff99a26d19efca7a7f3cafdfc1088
parent8c11cd2e09037e2eb0ae7f6f2186fd7c41458405
Merge branch 'MDL-41241-master-fix3' of git://github.com/damyon/moodle

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