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

author Sam Hemelryk <sam@moodle.com>

Sun, 22 Dec 2013 20:54:26 +0000 (09:54 +1300)

committer Sam Hemelryk <sam@moodle.com>

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

index b346b6b,8e2f7d1..b4b62ea

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

index bd56e8f,441a413..b289ee5

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

index 55eaefe,8e2f7d1..77dc52d

Binary files differ
diff --cc lib/yui/src/notification/js/dialogue.js
Simple merge
author	Sam Hemelryk <sam@moodle.com>
	Sun, 22 Dec 2013 20:54:26 +0000 (09:54 +1300)
committer	Sam Hemelryk <sam@moodle.com>
	Sun, 22 Dec 2013 20:54:26 +0000 (09:54 +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