Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 07:45:54 +0000 (15:45 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 23 Oct 2014 07:45:54 +0000 (15:45 +0800)
1  2 
lib/grade/grade_category.php

Simple merge