Merge branch 'MDL-38065-fix-master' of git://github.com/jmarthaler/moodle
authorMarina Glancy <marina@moodle.com>
Mon, 20 Oct 2014 06:08:06 +0000 (14:08 +0800)
committerMarina Glancy <marina@moodle.com>
Mon, 20 Oct 2014 06:08:06 +0000 (14:08 +0800)
1  2 
grade/report/user/lib.php

Simple merge