Merge branch 'MDL-59307_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Jul 2017 02:12:02 +0000 (10:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Jul 2017 02:12:02 +0000 (10:12 +0800)
commitd267d66fdf8819bbe6a9a040a24b86461287a848
treef668eb79ee9938ac0c7f101c742fcd24b53c1b0f
parentd509f80c48f4ef49a03ab8396eec869bc7563882
parent5c140ac4c06e8031ab0654e0329d408d4999a43d
Merge branch 'MDL-59307_master' of git://github.com/dmonllao/moodle