Merge branch 'MDL-59890-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 4 Oct 2017 03:19:33 +0000 (11:19 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 4 Oct 2017 03:19:33 +0000 (11:19 +0800)

Trivial merge