Merge branch 'MDL-42031-master' of git://github.com/mouneyrac/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 6 Nov 2013 06:18:38 +0000 (17:18 +1100)
committerMarina Glancy <marina@moodle.com>
Wed, 6 Nov 2013 06:18:38 +0000 (17:18 +1100)
commitbdb7c88635889bd84c1f0bf527e07699436f8a91
treed69c14213699b6c7df261db3443d2662e82c6683
parent6d2baaaea41c8a403ed495461696a58f08fe5471
parentd40ce26f0593f77aba471c32787950ef008aa3fa
Merge branch 'MDL-42031-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