Merge branch 'MDL-38741-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 04:00:52 +0000 (12:00 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 8 Apr 2013 04:00:52 +0000 (12:00 +0800)
commita6c215ab1f90d72f7f8adeaafe76f44a8cc0b248
tree7f27885c997884de9d8f49770bec212777d31b78
parentbf48be3c7cf4dd660a1aaf6896552372a5ce4eb3
parent8971ddd5a9c6fbfaf9b7c9e9579ddcaa40ce1201
Merge branch 'MDL-38741-master' of git://github.com/danpoltawski/moodle
question/type/calculated/edit_calculated_form.php
question/type/calculatedmulti/edit_calculatedmulti_form.php