Merge branch 'MDL-31112_dndupload_folder_detection' of git://github.com/davosmith...
authorSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 23:41:47 +0000 (12:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 23:41:47 +0000 (12:41 +1300)

Trivial merge