Merge branch 'MDL-31679' of git://github.com/aolley/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 04:49:35 +0000 (12:49 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 9 Apr 2014 04:49:35 +0000 (12:49 +0800)
commita935cccb2b31044b15e9ef15bf64fd0ef7fbdfc6
treea2cb66469256ae16292abfad4c96774121940f4b
parentc559161f4ab0988ebb8219105313d0ecb4045738
parent19213efb98f8611cffde0a9520379ac1b727cf16
Merge branch 'MDL-31679' of git://github.com/aolley/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css
grade/report/grader/index.php
grade/report/grader/styles.css
theme/bootstrapbase/style/moodle.css