Merge branch 'MDL-60655-master' of git://github.com/junpataleta/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 02:45:07 +0000 (10:45 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 2 Nov 2017 02:45:07 +0000 (10:45 +0800)

Trivial merge