Merge branch 'MDL-42598' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 13 Nov 2013 05:43:52 +0000 (13:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 13 Nov 2013 05:43:52 +0000 (13:43 +0800)
1  2 
mod/quiz/locallib.php

Simple merge