Merge branch 'MDL-47463-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 18:11:57 +0000 (19:11 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 18:11:57 +0000 (19:11 +0100)
commit4f639ec86b2362efe87f207ece4a69d3229407c2
treeae996ce69a736d4023ced1dfb8b69ccad2565991
parent1b07195b289d15ca477f298cc2c84ec2ec7be05e
parent1d65db8b398c88ae13a1b82d0659105c6fe5ceb5
Merge branch 'MDL-47463-master' of git://github.com/FMCorz/moodle
lib/grade/grade_category.php