Merge branch 'MDL-53301_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 07:50:15 +0000 (15:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Mar 2016 07:50:15 +0000 (15:50 +0800)
1  2 
lib/grade/grade_category.php

Simple merge