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)
commit5101954f03e63ca6fc32856b3a16e3fd9d9f5da5
tree1ad8d2dffe717db3ce4d6114c58da60eff98033c
parenta0a63fa52625ffd99e6c98374bb7af0ada768bd0
parent5d2d0e12d53e747ba419c81e244be3ae768dcc90
Merge branch 'MDL-41241-master' of git://github.com/damyon/moodle

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
lib/editor/atto/plugins/link/lib.php