Merge branch 'MDL-54910_m32v2' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Jun 2016 04:44:43 +0000 (12:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jun 2016 07:05:20 +0000 (15:05 +0800)
commit3654734601537eefea158b59c7e856b2b8457707
treebec1feeb2fea57b8b6d538fd2ca753730bd94bc5
parentbe88488274a8c8a79aad05a3c84b3697ef377bb4
parent316f20a0b66eeecec2c679541f2dc2e32e6cf500
Merge branch 'MDL-54910_m32v2' of https://github.com/sbourget/moodle