Merge branch 'MDL-59982_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 04:21:39 +0000 (12:21 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 04:21:39 +0000 (12:21 +0800)

Trivial merge