Merge branch 'MDL-54579_m31v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 May 2016 03:18:27 +0000 (11:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 May 2016 03:18:27 +0000 (11:18 +0800)
commit73b0dcb10630560de8f0e1e15043da19a1d17d75
treea0e857eb984d2e361bb95bd45566a8bba2406d31
parentaf6a424054ab32f98061c40ef38f0da04320a5a9
parent195b9ebb7c1508910e997186b825d679e206223c
Merge branch 'MDL-54579_m31v1' of https://github.com/sbourget/moodle