Merge branch 'MDL-29296' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 04:08:21 +0000 (17:08 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Oct 2011 04:08:21 +0000 (17:08 +1300)
1  2 
mod/lesson/locallib.php

Simple merge