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)
Conflicts:
mod/quiz/lib.php
mod/quiz/mod_form.php
mod/quiz/tests/behat/completion_condition_passing_grade.feature


Trivial merge