Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle

diff --cc grade/report/grader/lib.php
Simple merge

diff --cc mod/assignment/lib.php
Simple merge

diff --cc mod/data/lib.php
Simple merge

diff --cc mod/glossary/lib.php
Simple merge

diff --cc mod/lesson/lib.php
Simple merge

diff --cc mod/scorm/lib.php
Simple merge