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

author Damyon Wiese <damyon@moodle.com>

Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)

committer Damyon Wiese <damyon@moodle.com>

Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)
author Damyon Wiese <damyon@moodle.com>
Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)
committer Damyon Wiese <damyon@moodle.com>
Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)
diff --cc lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js

index bb7a4a7,d9ae8b0..1ab384e

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

index 1995629,1c7b1b0..f67b779

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

index f12ff3b,73d172f..b3898af

Binary files differ
diff --cc lib/yui/src/notification/js/dialogue.js
Simple merge
author	Damyon Wiese <damyon@moodle.com>
	Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)
committer	Damyon Wiese <damyon@moodle.com>
	Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)
		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