Merge branch 'w51_MDL-30787_m23_coursemodedit' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 23:08:23 +0000 (12:08 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 23:08:23 +0000 (12:08 +1300)
1  2 
course/moodleform_mod.php

Simple merge