Merge branch 'MDL-60983' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Dec 2017 02:56:37 +0000 (10:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Dec 2017 02:56:37 +0000 (10:56 +0800)
commitabb61e0b02ecbd8f204dbcc8d8a72d07b8598c30
treed80b2db14a87712c3ce190f4ab4085629fde06c2
parent57fe6616a8df48fc51f4cfd202f7be67ef36d334
parent91c8d8b130de0cbfddaa7d4685454bab84102fae
Merge branch 'MDL-60983' of git://github.com/timhunt/moodle