Merge branch 'MDL-30764-master' of git://github.com/sammarshallou/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Dec 2011 01:15:47 +0000 (14:15 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Dec 2011 01:15:47 +0000 (14:15 +1300)
1  2 
course/moodleform_mod.php

Simple merge