Merge branch 'MDL-43997-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Feb 2014 20:31:32 +0000 (09:31 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Feb 2014 20:31:32 +0000 (09:31 +1300)
commitc10affa57b218065d29476c2f65d76ba4250c8ed
tree67a1bc495dd11ae3e55ee5768011d37e4e00a813
parent38226a3f4a8c9b789c9752ee1e447d94d2c2eb3c
parentcfa770b47b082f73fd1b25b916347daab12b84be
Merge branch 'MDL-43997-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