Merge branch 'MDL-58932' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 07:57:09 +0000 (08:57 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 07:57:09 +0000 (08:57 +0100)

Trivial merge