Merge branch 'MDL-59698-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 04:43:42 +0000 (12:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 04:43:42 +0000 (12:43 +0800)
commita41ef5ece543172752d8020f6cf42a0deaa4ba05
tree5f3e5fde6ca2ea6797c68f52228f30a7e27997c8
parentab202d9247637b0059a45a7afcf1e0080f2316a2
parent63f4aa20b23d350c020a1577884a3f0f7bef234b
Merge branch 'MDL-59698-master' of git://github.com/damyon/moodle