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)
commit8c0ddd430a4bff4373be92bf3d7d98695c580348
treed9798a189627af9b95641c6047b8b34c3c17aae7
parentdbfdd1a4f9abd416ee73cf00d2b4c6013cb84935
parentd9bf4be4878070aef31c2bbe301081f3fb5f13b5
Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle

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