Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 11 May 2017 03:41:48 +0000 (11:41 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 11 May 2017 03:41:48 +0000 (11:41 +0800)

Trivial merge