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)
1  2 
lib/grade/grade_category.php
lib/grade/grade_item.php

Simple merge
Simple merge