Merge branch 'MDL-41254-m' of git://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Sep 2013 10:04:05 +0000 (18:04 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Sep 2013 10:04:05 +0000 (18:04 +0800)
commit0df3254212be90e5b2382ccdc2c02bcc825bb2af
tree0688afa45230dd6cdc1434b8d20bbf2833a0b40f
parentcdf6fc243e666fe3b0893606d84457bc1eea9dbb
parent91dbb244428424e21ba455c5fea5785ff249f1df
Merge branch 'MDL-41254-m' of git://github.com/micaherne/moodle
backup/controller/restore_controller.class.php