Merge branch 'MDL-61567-master' of git://github.com/zig-moodle/moodle
commit1290576dabaddfee532868e2c44e2e490d40f5dd
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Mar 2018 04:15:21 +0000 (13 12:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Mar 2018 04:15:21 +0000 (13 12:15 +0800)
treeeccbaf28243ab1df297b16ed8311a99829981dd9
parente43977e2d9e0565f7da2ea157fbefab606d107c7
parente3644cd5c621dd0410cc7dd6a760ce94683fc526
Merge branch 'MDL-61567-master' of git://github.com/zig-moodle/moodle