Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 07:45:54 +0000 (15:45 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 07:45:54 +0000 (15:45 +0800)
commit05599c47cb1c94a8ce3352e9fafb5565fc930c2c
tree2ea156c26c3914a1bcb00a42b8ca7cab8ec78741
parent41d58f6f4c197d9c6b89854d174c7f4d3f18a051
parentba0d27735aa6cc1a739bee986c02d067caca5240
Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle
lib/grade/grade_category.php