Merge branch 'wip-MDL-44321-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Mar 2014 05:50:18 +0000 (13:50 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Mar 2014 05:50:18 +0000 (13:50 +0800)
1  2 
mod/quiz/locallib.php

Simple merge