Merge branch 'MDL-52455_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE
commitaffd686294e6923e923c1d5f788ce0b92e106cbb
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 12:43:58 +0000 (21 12:43 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 12:43:58 +0000 (21 12:43 +0000)
treec833db278773391dafd6372d35ffbbd1679ebb87
parentfc1c26b8c0645799954e413dac2e4afc9f4b2c35
parent0b8f8f340200e8b4cfe69e39c6963659181a4618
Merge branch 'MDL-52455_29' of git://github.com/timhunt/moodle into MOODLE_29_STABLE
mod/quiz/locallib.php