Merge branch 'MDL-11047' of git://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 01:04:04 +0000 (14:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 20 Mar 2012 01:04:04 +0000 (14:04 +1300)
commit270bdf5265b968f3a45b97fa4c27e72a1ece2308
tree9637153f8b9b2538ad6303839e8a5db736277ae8
parent62cf6937f6521fa34c1ddf31439e4ff520d7053b
parent33c8d37b6f2fa380a50ef97d60103ed9a1f9c376
Merge branch 'MDL-11047' of git://github.com/mackensen/moodle

Conflicts:
mod/quiz/version.php
mod/quiz/lang/en/quiz.php
mod/quiz/version.php