Merge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 08:34:22 +0000 (16:34 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 29 Feb 2016 08:34:22 +0000 (16:34 +0800)
commitb70b436875ff0b0ecad5a5ca1dc221b9a73d4c89
tree966ba04c1118aa8d74a1644bd8458fa86e7fd9b6
parentc3717ca64e72f8c9015247eb7321996465884252
parent8ad534bd9fed444fbd01484a4e217fc1f2864da4
Merge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle
mod/feedback/item/multichoice/lib.php
mod/feedback/item/multichoice/multichoice_form.php