Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:18:18 +0000 (11:18 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Jan 2013 03:18:18 +0000 (11:18 +0800)
commit0f94289c1dce2909efccbc936968ff8cac389fbb
tree3c5f23b1532d98762ab081bc96b0b90718b742d0
parent47ee9f9100a4451a061ff9af0b96e872e6b4fb32
parentead25632bf81af2df1d82132afec0943d044a80d
Merge branch 'MDL-33688_dndupload_progress' of git://github.com/davosmith/moodle

Conflicts:
files/renderer.php
lib/outputrenderers.php
files/renderer.php
lib/form/dndupload.js
lib/outputrenderers.php
theme/base/style/course.css
theme/base/style/filemanager.css