Merge branch 'MDL-55987-master-grademem' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 10:23:51 +0000 (11:23 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 10:23:51 +0000 (11:23 +0100)

Trivial merge