Merge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 05:59:26 +0000 (13:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 05:59:26 +0000 (13:59 +0800)
1  2 
mod/lesson/locallib.php

Simple merge