Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 May 2014 03:48:38 +0000 (11:48 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 May 2014 03:48:38 +0000 (11:48 +0800)
commit02c482704bc4975bb22f33d27d240c477d2b94d5
tree6573341e84fff59153fe990d72002e39f04ed810
parent73c2ae4bff1898fc8452f2d8463f16413fb07fd2
parent664c851755267331555820363aee20871c13353e
Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle

Conflicts:
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-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