Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 7 Oct 2014 09:16:56 +0000 (17:16 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 7 Oct 2014 09:16:56 +0000 (17:16 +0800)
1  2 
mod/lesson/lib.php

Simple merge