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)
1  2 
mod/lesson/lang/en/lesson.php
mod/lesson/locallib.php
mod/lesson/pagetypes/matching.php

Simple merge
Simple merge
Simple merge