Merge branch 'MDL-48191-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE
commiteccf806ad05c573a90087a2cf8a7db6d6423c599
authorSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 19:59:13 +0000 (26 08:59 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 25 Nov 2014 19:59:13 +0000 (26 08:59 +1300)
tree4081783dcdd6e9b3720e7730aad1ff3a9972d7e8
parent1198f5ae01f19b6f0dd13b5a35af1eeb9d0db8fb
parentcfbc7d903faf0ed3fe01dc64eeb965e28da34fdd
Merge branch 'MDL-48191-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE

Conflicts:
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-debug.js
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable-min.js
grade/report/grader/yui/build/moodle-gradereport_grader-gradereporttable/moodle-gradereport_grader-gradereporttable.js
grade/report/grader/yui/src/gradereporttable/js/floatingheaders.js