Merge branch 'MDL-33393' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 09:00:09 +0000 (17:00 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jun 2012 09:00:09 +0000 (17:00 +0800)
commit203d255116f12bf1596805349b3a608e22ea1f5f
treec1f4388ba71e2041a1e2ec17d3c48c77fb83a0a4
parent82fc6ae6e3baab873b4d0e22d5ef04482358e85b
parentd9552ab44f235e7bdbdf6dfd20f98f1a014d7e3b
Merge branch 'MDL-33393' of git://github.com/timhunt/moodle

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