Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 06:54:46 +0000 (14:54 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 06:54:46 +0000 (14:54 +0800)
commit67c0e18ca2895ed5ab4d4d1d376959b8c4d93a75
tree647cf2722708794f4593773427d07311f6404e20
parent5258525f0abed93822b0a1bbab924b167a530f9a
parent5c1ea9aea5ddf2206332dbd765bdee8eafff357a
Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle