Merge branch 'MDL-35925-master' of git://github.com/phalacee/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 07:23:05 +0000 (15:23 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Sep 2013 07:23:05 +0000 (15:23 +0800)
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js

1  2 
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
repository/filepicker.js