Merge branch 'MDL-58167-master' of git://github.com/lameze/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 1 May 2017 06:51:43 +0000 (14:51 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 1 May 2017 06:51:43 +0000 (14:51 +0800)

Trivial merge