Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 03:44:49 +0000 (15:44 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 10 Sep 2013 03:44:49 +0000 (15:44 +1200)
1  2 
mod/lesson/import.php

Simple merge