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)
1  2 
grade/edit/tree/lib.php
lib/grade/grade_category.php

Simple merge
Simple merge