From: Jun Pataleta Date: Wed, 3 Jan 2018 08:53:49 +0000 (+0800) Subject: Merge branch 'MDL-60962-master' of git://github.com/ryanwyllie/moodle X-Git-Tag: v3.5.0-beta~543 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=60236650d6535e2712736c1e57a84a0b39446147 Merge branch 'MDL-60962-master' of git://github.com/ryanwyllie/moodle --- 60236650d6535e2712736c1e57a84a0b39446147