Merge branch 'MDL-42571' of git://github.com/blaky/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Nov 2015 05:39:59 +0000 (13:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Nov 2015 05:39:59 +0000 (13:39 +0800)
commit09083ab0a86ea4bdbcf7b7281045f8d5939c3909
tree4f9c348c7dba457d0434e1c28632f0caf2cde07e
parent26653c8b5c69879e9ff166055d96c5b0b6fcaf17
parentda91de78217dbb72d46eaff4e28e2d880346d82f
Merge branch 'MDL-42571' of git://github.com/blaky/moodle

Conflicts:
mod/assign/feedback/editpdf/version.php
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.js
mod/assign/feedback/editpdf/yui/src/editor/js/editor.js