Merge branch 'MDL-59492-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 14 Aug 2017 04:16:08 +0000 (12:16 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 14 Aug 2017 04:16:08 +0000 (12:16 +0800)

Trivial merge