Merge branch 'MDL-53537_m34v4' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Aug 2017 00:46:55 +0000 (08:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 16 Aug 2017 00:46:55 +0000 (08:46 +0800)
commit34cf57f1d027e2d6b8403f3f98f30cfb6fd4756a
tree7055cc2c06936429dd1be207a8e96d2fa782aaa3
parentddea9878125fd37fb0b9530de35462a707f35374
parentf5de9484e85117b0e6b9489d08febfe48e5efca0
Merge branch 'MDL-53537_m34v4' of https://github.com/sbourget/moodle