Merge branch 'MDL-58986_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 May 2017 04:21:11 +0000 (12:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 May 2017 04:21:11 +0000 (12:21 +0800)

Trivial merge