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)
1  2 
grade/import/csv/classes/load_data.php
grade/import/csv/tests/load_data_test.php
grade/import/direct/index.php
lang/en/grades.php

Simple merge
Simple merge