Merge branch 'MDL-60219-master' of https://github.com/abias/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Dec 2017 08:28:16 +0000 (16:28 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Dec 2017 08:28:16 +0000 (16:28 +0800)

Trivial merge