Merge branch 'MDL-56769-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 05:38:00 +0000 (13:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 05:38:00 +0000 (13:38 +0800)
commit49ae3661d3325175dc03cae65e8a76ef7473ead6
tree1a93773ae95266b937738b19accde118a6db0d89
parent0b8e0c374f89ca20e5b9e7c9370761810811edc6
parent6fe0b5bd9b56c971e396f855df275959275cbcf0
Merge branch 'MDL-56769-master' of git://github.com/damyon/moodle