Merge branch 'MDL-60564_master' of git://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 26 Oct 2017 06:43:39 +0000 (14:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 26 Oct 2017 06:43:39 +0000 (14:43 +0800)
commitef7df2ae0a740aa3d24bfe671eeeaf5b365466c5
treeecc5c1933b2f851c48bdf524b68bd5ce00fccf9c
parent4d03dbf13d7b25de5f3087335cabf66b55e3e819
parent8e85371800734674f04f8d4d7352252d51852644
Merge branch 'MDL-60564_master' of git://github.com/markn86/moodle