Merge branch 'MDL-59977_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 09:18:16 +0000 (17:18 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Sep 2017 09:18:16 +0000 (17:18 +0800)

Trivial merge