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)
1  2 
backup/moodle2/backup_stepslib.php
backup/moodle2/restore_stepslib.php

Simple merge
Simple merge