Merge branch 'MDL-49256-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 09:42:35 +0000 (17:42 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 09:42:35 +0000 (17:42 +0800)
commitceba96bbca9d02bcd3d7ece895352b097e11fdb1
tree6db20f3978d3a7fb105fb55331b7927a89dda3bf
parent449f3db147868bde542e4a7f0db8b44c6356282e
parentc4e2c67134ce6fd4389e4de7978a41806764455c
Merge branch 'MDL-49256-master' of git://github.com/andrewnicols/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