Merge branch 'MDL-49065_m29v6' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Apr 2015 12:15:33 +0000 (14:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Apr 2015 12:15:33 +0000 (14:15 +0200)
commit615812040aabe79483bbb2507efd42634b624163
treedb7cadd4c13cc1e7e4818e40d4ebf253b352345a
parente64f1fa1c7422d68de500ef78045f3c9bd5608db
parent446db9fe337db19c5c83d8f30e85a6e5a47c6fc5
Merge branch 'MDL-49065_m29v6' of https://github.com/sbourget/moodle
mod/lesson/lang/en/lesson.php
mod/lesson/lib.php