Merge branch 'MDL-47575-master' of git://github.com/zbdd/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 02:19:05 +0000 (10:19 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 15 Oct 2014 02:19:05 +0000 (10:19 +0800)
1  2 
grade/report/user/lib.php

Simple merge