Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 22 Oct 2014 09:49:07 +0000 (10:49 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 22 Oct 2014 09:49:07 +0000 (10:49 +0100)
1  2 
grade/report/user/lib.php

Simple merge