Merge branch 'MDL-46978' of https://github.com/danielneis/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 6 Oct 2014 21:26:05 +0000 (10:26 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 6 Oct 2014 21:26:05 +0000 (10:26 +1300)
commitf46606936ab73e394b6bcf42663ad1fed766cca4
treea3519670436b615fec13a851624e70574640ff55
parent15b57a34dfd33e0cc509a6ab6726e1f3906d3aba
parentbad2c9b14f27e6d9a370ac6cff6b8b5c2dc79a17
Merge branch 'MDL-46978' of https://github.com/danielneis/moodle
lib/grade/grade_category.php
lib/grade/grade_item.php