Merge branch 'MDL-47132' of git://github.com/timhunt/moodle
commitba2f9a96955102e5f316e8450c0e89b406f4c55b
authorSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 23:01:42 +0000 (8 12:01 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 7 Oct 2014 23:01:42 +0000 (8 12:01 +1300)
treef42c31b500e5bcb2938491acf29c56869e59ed0c
parent13f60ffce1a6b0ae9830a668e8125f76dc3904cc
parent16fa272e29cb205de97b2c620afd637b8c45ef24
Merge branch 'MDL-47132' of git://github.com/timhunt/moodle
mod/quiz/edit.php
mod/quiz/styles.css
mod/quiz/upgrade.txt