Merge branch 'MDL-61194-master' of git://git.cameron1729.xyz/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 09:07:57 +0000 (17:07 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 09:07:57 +0000 (17:07 +0800)

Trivial merge