Merge branch 'MDL-32113-master' of https://github.com/lucaboesch/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 19 Dec 2017 07:12:11 +0000 (15:12 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 19 Dec 2017 07:12:11 +0000 (15:12 +0800)
commit6e1bfdda19e838f7a4a934567e9e4e5ee532d535
treea5d8d9f314d9fbf4834be1b8aa2ed702d618edfd
parentdf060516ed6747f57b3813a301c3b9de648bc945
parentff4d8e802ce136960b1049d37196141ec30e3182
Merge branch 'MDL-32113-master' of https://github.com/lucaboesch/moodle