Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle
commit410bb9a92c299f4c5c871e92a62245e1f7560088
authorMarina Glancy <marina@moodle.com>
Tue, 10 Jun 2014 07:41:53 +0000 (10 15:41 +0800)
committerMarina Glancy <marina@moodle.com>
Tue, 10 Jun 2014 07:41:53 +0000 (10 15:41 +0800)
treeed9b05b5a425317cbd51be66855e6c0040a84fa4
parent5d44ea33336b85ba38489c1840d72352d6710e0a
parent828a4e9f6e60e2ecd5dcbd7f44e920bc2840867f
Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle
mod/quiz/editlib.php
mod/quiz/lib.php