Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2013 23:48:45 +0000 (01:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2013 23:48:45 +0000 (01:48 +0200)
commit7e9dadfd99c05dfe9a4437d07f4e3b979fd52ee6
treea96490866f36eb9080136a747533c944dbbcb8b9
parent571781fbf6337468aa1ce83cbf4da5af8af6b5f2
parentbb76233dd2bd4dce6389b2739ae55bc47f278985
Merge branch 'MDL-42026-master' of git://github.com/damyon/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
lib/editor/atto/yui/src/editor/js/editor.js