Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith...
authorSam Hemelryk <sam@moodle.com>
Wed, 16 May 2012 22:55:35 +0000 (10:55 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 16 May 2012 22:55:35 +0000 (10:55 +1200)
commit7b06151288072f0b9e6f02af5935ca54add0aa30
treefe3ea5cf1ee493637e8b07ebf7abbb3527adec14
parentfbb4c959b5f3fed091052fecdab50bd73f7a8fd5
parent33b24bdd9998239fedf0b156ec7bb7312e8df5da
Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle

Conflicts:
course/lib.php
theme/base/style/course.css
course/lib.php
course/view.php
index.php
lang/en/moodle.php
mod/folder/lib.php
mod/page/lib.php
mod/resource/lib.php
mod/url/lib.php
theme/base/style/course.css