Merge branch 'MDL-52218_master_alt' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 14:03:54 +0000 (14:03 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 14:03:54 +0000 (14:03 +0000)
1  2 
grade/report/grader/lib.php

Simple merge