Merge branch 'MDL-40419-master-2nd' of git://github.com/FMCorz/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 21:02:59 +0000 (10:02 +1300)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:03:18 +0000 (12:03 +0000)
commit7594ed1e2a729270a85bdb1499bd87df6fbc499d
tree78cda748113d827d9353e63979ef73724b720835
parent6c4e70a6d8e35c7f3a566b31f29adb07deb203ad
parentdc8ee30eda3a4cfb7b60fc65b1924bb27ba7326b
Merge branch 'MDL-40419-master-2nd' of git://github.com/FMCorz/moodle
backup/moodle2/restore_stepslib.php
lib/blocklib.php