Merge branch 'MDL-50529_dupe' of git://github.com/andyjdavis/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 01:58:17 +0000 (09:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Sep 2015 01:58:17 +0000 (09:58 +0800)
1  2 
grade/lib.php

diff --cc grade/lib.php
Simple merge