Merge branch 'MDL-35717-quiz-attempt-checkstate' of git://github.com/mpetrowi/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Nov 2012 04:07:04 +0000 (12:07 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Nov 2012 04:07:04 +0000 (12:07 +0800)
commit939a43e426e2a2a3676d1b30f09cce0e2cc5395b
treed6367b985780d1125553444a14dc218fc7d269f0
parentb4272e0005c99178366e6c46b2fb61588fa4f01a
parent8e771aed93eea08cc3e9410283f5354e02311281
Merge branch 'MDL-35717-quiz-attempt-checkstate' of git://github.com/mpetrowi/moodle

Conflicts:
mod/quiz/tests/generator/lib.php
mod/quiz/lib.php
mod/quiz/module.js
mod/quiz/renderer.php
mod/quiz/tests/generator/lib.php