Merge branch 'MDL-59371-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jul 2017 02:23:06 +0000 (10:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jul 2017 02:23:06 +0000 (10:23 +0800)
commitcdbfc8d3efef0aeaaf067b467b2f106ef8a27fa7
treef4904a74d6d80919153a7b9ddab3f8353c1b2969
parent16a68a2f762838212934a2a4bd286866edae764e
parent5d6b1895745b94ec6a5daedd94ccaa294e665e5b
Merge branch 'MDL-59371-master' of git://github.com/lameze/moodle