Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2...
authorSam Hemelryk <sam@moodle.com>
Thu, 17 Jul 2014 03:16:07 +0000 (15:16 +1200)
committerSam Hemelryk <sam@moodle.com>
Thu, 17 Jul 2014 03:16:07 +0000 (15:16 +1200)
commite6330e5ba8b762c4832c4bb51310455d2c8f006b
tree7d565124131b2db87a784f3b2025ef145cd4a724
parent68b1e63080c253cd88b3d2fbe32805d11a1debfc
parent349c9303439c8e48f432e4bb1a87091a3f722177
Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle

Conflicts:
mod/quiz/lib.php
mod/quiz/mod_form.php
mod/quiz/tests/behat/completion_condition_passing_grade.feature