Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 04:42:13 +0000 (12:42 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 04:42:13 +0000 (12:42 +0800)
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
lib/yui/src/notification/js/dialogue.js


Trivial merge