Merge branch 'MDL-38315-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
authorDamyon Wiese <damyon@moodle.com>
Mon, 6 May 2013 14:06:01 +0000 (22:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 6 May 2013 14:06:01 +0000 (22:06 +0800)
1  2 
course/modedit.php
mod/choice/mod_form.php
mod/feedback/mod_form.php
mod/forum/mod_form.php
mod/glossary/mod_form.php
mod/scorm/mod_form.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge