Merge branch 'MDL-61240' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 03:36:41 +0000 (11:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 03:36:41 +0000 (11:36 +0800)
commit6092574ddf9374a870c873bd2f6315b56f5a48fb
treec7cb984932f3994a0fb54e71dad63bf84aa76499
parent0cc0f72ceb1ae07789120d9c3a63738fada4d190
parent5405354d884e1cb03253962aa3edc640e89572fe
Merge branch 'MDL-61240' of git://github.com/stronk7/moodle