Merge branch 'MDL-46696-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 15:23:59 +0000 (16:23 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Sep 2014 15:23:59 +0000 (16:23 +0100)
commita3b93be8f8efe1bfe88fc915213d121debbfb4ed
treed1794dad3685bebc4b42b55e7c7b37ebe85e0089
parent0072e5d5598e8253531734596a4c255bda727f96
parent167eb0335b305d7c18ba29ec4cb18aca1a05ce41
Merge branch 'MDL-46696-master' of git://github.com/FMCorz/moodle
backup/moodle2/backup_stepslib.php
backup/moodle2/restore_stepslib.php