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)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:06 +0000 (11:48 +0200)
commit3824556c9abcd3bdba97df14ca1ee0a75c9e5791
tree1defea6a45d0cb061cdec6b7999df9fb083617b1
parent65504187d87b934916d0cee20b730d89e731aa2d
parentba0d27735aa6cc1a739bee986c02d067caca5240
Merge branch 'MDL-47704-master' of git://github.com/damyon/moodle
lib/grade/grade_category.php