Merge branch 'MDL-51498_regrade_perf' of https://github.com/moodlerooms/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 10:09:12 +0000 (11:09 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 10:09:12 +0000 (11:09 +0100)

Trivial merge