Merge branch 'MDL-48883_m29v5' of git://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Feb 2015 04:26:40 +0000 (12:26 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 Feb 2015 04:26:40 +0000 (12:26 +0800)
commitcaaeabd0f46ce68a1907e8b0a0da6f382a9a2329
tree3f355fc205a545ace2ceba8a0d520c3aedfc732c
parent6628ea3f0c5e0af50188b75e7089d01be7923865
parenteaa717bbe1c6cd1897324282d3cb17a5352fa002
Merge branch 'MDL-48883_m29v5' of git://github.com/sbourget/moodle
mod/lesson/lang/en/lesson.php
mod/lesson/locallib.php
mod/lesson/pagetypes/matching.php