Merge branch 'MDL-48880' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 10:21:11 +0000 (11:21 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 31 Mar 2015 10:21:11 +0000 (11:21 +0100)
commitdeadda2f86c83a4439c794d4374c9d29887c1a96
tree32365e3dae1bdba46ac109ad35daf7004f7c73a5
parent4e664d168994207f916280a85b7a1961ec45e37b
parent7e0551fc4515211577a0a4fee2e647ae2d176ea5
Merge branch 'MDL-48880' of git://github.com/jmvedrine/moodle

Conflicts:
mod/lesson/db/upgrade.php
mod/lesson/version.php
mod/lesson/backup/moodle2/restore_lesson_stepslib.php
mod/lesson/db/upgrade.php