Merge branch 'MDL-42401-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:43:02 +0000 (14:43 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Oct 2013 06:43:02 +0000 (14:43 +0800)
commitc426631850583777f1f93e4e159ff7f4ad798d65
tree747d6c250d45eb0d88bac54ec6c6954b9ec0ea3b
parent02b87ac151cb3cf490a224935ed2440f34ab24cb
parent6d87dcebe2496106d525c55500cb7758a9607130
Merge branch 'MDL-42401-master' of git://github.com/damyon/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