Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith...
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 09:36:03 +0000 (17:36 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jun 2012 09:36:03 +0000 (17:36 +0800)
commit6855fec7fd42dbf5990052a5d34884f1377c394e
tree8339b51017f443b047853ccee42ffac00fa44014
parent44b836d629466bdd5fcef295a34da73f700cccba
parentb8a22d22fef7954cea16772b71945a6e9e20139d
Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle
lang/en/moodle.php
lang/en/repository.php
lib/outputrequirementslib.php
repository/upload/lib.php