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)
commit382d11a43c202c4a92167ebcb2b60ea89f5acc02
tree1e50c861904d5c1047f2fc477b3c758f2abbeec1
parent68b9d1f408dec48003b68a706e364061afee916a
parent91813c1b4bf195e91933c780a716f6c2104d5c0e
Merge branch 'MDL-35288_dndupload_folder_warning' of git://github.com/davosmith/moodle