Merge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Oct 2014 11:40:27 +0000 (11:40 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Oct 2014 11:40:27 +0000 (11:40 +0000)
commit31d6d2ae41fe8d8b787152062fa1660047de5827
tree0754c6bcfb2c2352c43f88a132ca4f4b724d57fc
parentb5478757c61f4edb48bcd4da994db8ec7ed7d58a
parent37fc69a01923262cf4c25c62098f8862193d48ca
Merge branch 'MDL-47703-master' of git://github.com/FMCorz/moodle
grade/edit/tree/lib.php
lib/grade/grade_category.php