Merge branch 'MDL-59854-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 04:27:34 +0000 (12:27 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 04:27:34 +0000 (12:27 +0800)

Trivial merge