Merge branch 'MDL-47637-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:16:07 +0000 (16:16 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:16:07 +0000 (16:16 +0100)
1  2 
lib/grade/grade_category.php

Simple merge