Merge branch 'MDL-51445_m31v1' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jan 2016 01:20:31 +0000 (09:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jan 2016 01:20:31 +0000 (09:20 +0800)
commitaabb46e9acde9237f4f79d7a63ea6f4d8ae4732d
tree16c7db9a829aa2645fffd85b133a7be8b58be40b
parentef343c32998a2827de2e883a58d5bcc7b3730b3f
parentbf5a27ce174f4d60427e3a25d0829546a4cb9893
Merge branch 'MDL-51445_m31v1' of https://github.com/sbourget/moodle