Merge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 06:35:51 +0000 (14:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 11 Mar 2014 06:35:51 +0000 (14:35 +0800)
commit72e2a1d7eb9d8c6922238843fd3daf03d1d3d72d
treeee59d5810593d759a242faf718bc8a8dd3e6ad65
parent234f953c440f53b85a4147df8cd36a628390fab6
parentd10e6118761102bd58da47722157d401f4f21974
Merge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
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