Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 14:33:46 +0000 (15:33 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 14:33:46 +0000 (15:33 +0100)
commitda88accb5f2c8af2a87388ec5ca865589c008928
tree53715cbcba531f8d67b202ff1c2363102d64f97d
parentaeb47dd84a33707b7171af6ca032afc7216ee59a
parent1464bcc8ed22dcf2318339e65a053aa32f3b84ab
Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle
grade/lib.php
lang/en/grades.php
lib/classes/plugin_manager.php
phpunit.xml.dist