Merge branch 'MDL-43325-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 22 Dec 2013 20:54:26 +0000 (09:54 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 22 Dec 2013 20:54:26 +0000 (09:54 +1300)
commit8ca4f69539a7f385c8c12651b848d9ed17b2f40b
tree8aadc16924fbadfd374fa7948ab6bd0a8d827abe
parentedd9bb451c1f4815245db8799bc86919a88d72d7
parent5c1d99b02748dd85ec24a18acea4f0912529bdba
Merge branch 'MDL-43325-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