Merge branch 'MDL-60752-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 9 Nov 2017 07:08:11 +0000 (15:08 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 9 Nov 2017 07:08:11 +0000 (15:08 +0800)
commitbef5a8ca10ded3a4adcd66a4f54495a9e61e1c1e
treee813b789a0781e7a7f54a11d678d8eb24ecf87af
parent4f3262fede9b86ba610966db95753a84b06a4aba
parentf169f4fd21a76784b55344b1b920885e2c46d634
Merge branch 'MDL-60752-master' of git://github.com/andrewnicols/moodle