Merge branch 'MDL-35288_dndupload_folder_warning' of git://github.com/davosmith/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 22:18:54 +0000 (11:18 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 7 Oct 2012 22:18:54 +0000 (11:18 +1300)

Trivial merge