Merge branch 'MDL-46658-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 09:26:13 +0000 (10:26 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 Oct 2014 09:26:13 +0000 (10:26 +0100)
commite462093201ca069451119f53b34d8c47500ae45e
tree33d57d4dbb442eb8e0eb36ff6e009725ecd65c1a
parente5d5bfdc4f421ea8c86d6786e56b5ad839317967
parent7feac0aab69f5aad57cb3511bbf64acdfa887341
Merge branch 'MDL-46658-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css
grade/report/grader/index.php
grade/report/grader/lib.php
lang/en/grades.php
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css