Merge branch 'MDL-45359-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 5 May 2014 09:24:08 +0000 (17:24 +0800)
commit6d8617bed9c75d8452daacf4e5d222043efdbda4
tree119e40261353b7abe9e6a8e55e7556c39bc51321
parenta7c1a5bcb59fddcdf338ebd62acba1d452828b8c
parent0ef60744c35d25d0d8cd2207c9d8c0b8e41a4fd7
Merge branch 'MDL-45359-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