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)
commitd3cb25dfefbf7711aacec7f2ba221f9400c35c15
treefe4d66ff46943abf006c368df0abd77e1933c720
parent2c6dbf4a54fbe6af070a74b3609b699b396f5aff
parent9d58dae33b5e71943cf977bcc549426732b89d20
Merge branch 'MDL-32322' of git://github.com/timhunt/moodle

Conflicts:
mod/quiz/report/simpletest/testreportlib.php
mod/quiz/report/statistics/simpletest/test_qstats.php