Merge branch 'MDL-43234-master' of git://github.com/andrewnicols/moodle

author Sam Hemelryk <sam@moodle.com>

Tue, 17 Dec 2013 20:53:02 +0000 (09:53 +1300)

committer Sam Hemelryk <sam@moodle.com>

Tue, 17 Dec 2013 20:53:02 +0000 (09:53 +1300)
author Sam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 20:53:02 +0000 (09:53 +1300)
committer Sam Hemelryk <sam@moodle.com>
Tue, 17 Dec 2013 20:53:02 +0000 (09:53 +1300)
diff --cc lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js

index c9a2a66,6699fb5..b346b6b

Binary files differ
diff --cc lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js

index 2b4160b,8fe5cb9..bd56e8f

Binary files differ
diff --cc lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js

index 6d3c2d7,6699fb5..55eaefe

Binary files differ
diff --cc lib/yui/src/notification/js/dialogue.js
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Tue, 17 Dec 2013 20:53:02 +0000 (09:53 +1300)
committer	Sam Hemelryk <sam@moodle.com>
	Tue, 17 Dec 2013 20:53:02 +0000 (09:53 +1300)
		1	2
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/yui/src/notification/js/dialogue.js	patch \|	diff1 \|	diff2 \|	blob \| history