Merge branch 'MDL-60096-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 08:56:46 +0000 (16:56 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 08:56:46 +0000 (16:56 +0800)

Trivial merge