Merge branch 'MDL-41241-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 00:58:17 +0000 (13:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Oct 2013 00:58:17 +0000 (13:58 +1300)
Conflicts:
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
lib/editor/atto/plugins/link/yui/src/button/js/button.js

1  2 
lib/editor/atto/plugins/link/lib.php

Simple merge