Merge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 13:30:44 +0000 (14:30 +0100)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Oct 2014 13:30:44 +0000 (14:30 +0100)
commit7dc62ed3cb0b81b945568b60157ee3b30cd7b5c6
tree27145c30eea1adc6c31a233849f421ca44b953c2
parent1429a25cd80e1e557518759ff9da557c92f1570b
parent65e274d76fadfea6f775aee2517d4b09dab0982d
Merge branch 'wip-MDL-47676-master' of git://github.com/abgreeve/moodle
grade/tests/behat/grade_natural_normalisation.feature
lib/grade/grade_category.php