Merge branch 'MDL-56621-master' of git://github.com/damyon/moodle
commitb9703b8e056b2e124aa3eaf8890a65effe01934c
authorDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 21:20:53 +0000 (1 21:20 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 21:20:53 +0000 (1 21:20 +0000)
tree0fde4a541a78ebee8df4a5d7cd751bde91a283ed
parentcad8adccc796f40ab11b1236cd637e9b987c17c8
parent2259c0f0781c305d22235c56f329bcdcdd3f95eb
Merge branch 'MDL-56621-master' of git://github.com/damyon/moodle