Merged branch 'MDL-28491' of git://github.com/timhunt/moodle.git with conflict resolution
authorSam Hemelryk <sam@moodle.com>
Tue, 18 Oct 2011 01:31:34 +0000 (14:31 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 18 Oct 2011 01:31:34 +0000 (14:31 +1300)
commitf856216cb1b2699c18c654ed692afc14aae4c2bd
tree7db6528ab1333b2515db2efbc0b202903990a29b
parent065d6d80a24b82423e6ddb382b39695887b7c7c4
parent1b796a2700f148747e11b31d8ca6948164a4ab7b
Merged branch 'MDL-28491' of git://github.com/timhunt/moodle.git with conflict resolution
mod/quiz/summary.php