Merge branch 'MDL-22504_drag_and_drop_upload_integration' of git://github.com/davosmi...
authorDan Poltawski <dan@moodle.com>
Mon, 21 May 2012 09:22:13 +0000 (17:22 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 May 2012 09:22:13 +0000 (17:22 +0800)
commit5c50d45b79137038ce9487564d25b05fd0b90eca
tree6353fb3b2d1018ee57d86800be044e22042b2a70
parent04acd266638222f9f569aaf5170189a572bb650a
parent1ddc3d1f4c399b6d4f4c2a0e7bd4ba7ec3bf5771
Merge branch 'MDL-22504_drag_and_drop_upload_integration' of git://github.com/davosmith/moodle
lang/en/moodle.php