Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 05:25:26 +0000 (13:25 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 24 Mar 2015 05:25:26 +0000 (13:25 +0800)
commita2be9de182787610b71ac4c0c9a3f4c8bf79f486
tree581583934ebc86a099987932ca16572fa4974c5f
parent019e26db6dce9e8e6ba5f6e802da14cf83f0c5b7
parente0f7b963475929fec76d1e76335a52d625cf8438
Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle

Conflicts:
mod/lesson/version.php
mod/lesson/lang/en/lesson.php
mod/lesson/locallib.php
mod/lesson/tests/events_test.php
mod/lesson/version.php