Merge branch 'MDL-46599-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 16:30:27 +0000 (17:30 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 16:30:27 +0000 (17:30 +0100)
commite2270952c50969b5c85c0c28d488b5344106c26c
treef3f7b34cb576aa8d6ebdb57d70646a71479bac10
parentf931c9245efb70e6aa5c02a91cb82e397977944c
parentb9cafe3b405353ac6c066b3455ac38f57c7bb371
Merge branch 'MDL-46599-master' of git://github.com/lameze/moodle
grade/import/csv/classes/load_data.php
grade/import/csv/tests/load_data_test.php
grade/import/direct/index.php
lang/en/grades.php