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)
commit6b25e62f4886c840e93fff64845f48f87a680e09
treebd85717c7697eaa82b9bcb9bd9a4fbfb8fdbc550
parentc932a4db7c9b87dabda628376a1c0ac82873e8fc
parent2eaaae00be0312c971de246bfaef1bc43d5d1957
Merge branch 'MDL-35925-master' of git://github.com/phalacee/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
repository/filepicker.js