Merge branch 'MDL-31642_dndupload_filemanager_notification_text' of git://github...
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 00:31:08 +0000 (13:31 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Mar 2012 00:31:08 +0000 (13:31 +1300)
1  2 
lib/form/dndupload.js
lib/form/filemanager.js

Simple merge
Simple merge