Merge branch '41214-26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 09:32:08 +0000 (17:32 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 09:32:08 +0000 (17:32 +0800)
commitee0be46957714e4c73f9b4f17c9d9d29d44aadfd
treeabd2628124b9084399efb0d041e039908bd56675
parent56b9e0b5653972b8bc3a6ec43e40159594c43d3c
parentf2b235cb147afd693cf9c6a8f3c14be20761282e
Merge branch '41214-26' of git://github.com/samhemelryk/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