Merge branch 'MDL-38732-master-2nd' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 18:00:28 +0000 (19:00 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 18:00:28 +0000 (19:00 +0100)
1  2 
lib/grade/grade_category.php

Simple merge