Merge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 02:19:47 +0000 (10:19 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Oct 2013 02:19:47 +0000 (10:19 +0800)
commit459dbd43622d58cf5b96bf4a7c310d514fc3c6ae
treeb0ce5f170c86779bcd9e638b49d75ed476cde6bd
parent295e4fa8f49cab5ab5f17dfc235d6039b615c571
parent673c4ffe606ac13b81f22e47949a5fa21496b406
Merge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle

Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-debug.js
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor.js
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js