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)
1  2 
grade/report/grader/lib.php
lang/en/grades.php
lib/classes/plugin_manager.php

Simple merge
Simple merge
Simple merge