Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 05:46:29 +0000 (13:46 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 26 Mar 2013 05:46:29 +0000 (13:46 +0800)
commit8af0dffb5017fea25bf1401b290140711b306e51
tree2cf772b0aa25f3100f46caab861f9482f3fd10a9
parent59ef4aab75db31182c26fa29007db69c7daa35f5
parentb716cd2b702da070003cd19c808eff3309e32c6f
Merge branch 'MDL-34311-master' of git://github.com/danpoltawski/moodle

Conflicts:
course/moodleform_mod.php
lib/upgrade.txt
course/edit_form.php
course/moodleform_mod.php
lib/formslib.php
lib/upgrade.txt