Merge branch 'MDL-18229-master' of git://github.com/zbdd/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 12:44:48 +0000 (13:44 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 12:44:48 +0000 (13:44 +0100)
commitd65eefdbf13ff753b546b566bfbc67fd2e3035a8
treec74224d453c6e3089bfffb610c17923deb75e968
parent01c3b4c50befeb8cd7cb74b6754c48475a238006
parent1b2c1ccb4c9fc1ed88832b8ef7740434b2ec5114
Merge branch 'MDL-18229-master' of git://github.com/zbdd/moodle
grade/report/grader/lib.php
lang/en/grades.php
lib/classes/plugin_manager.php