Merge branch 'MDL-32322' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 01:02:14 +0000 (03:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Apr 2012 01:02:14 +0000 (03:02 +0200)
Conflicts:
mod/quiz/report/simpletest/testreportlib.php
mod/quiz/report/statistics/simpletest/test_qstats.php


Trivial merge