Merge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Mar 2017 06:35:00 +0000 (14:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Mar 2017 06:35:00 +0000 (14:35 +0800)
commit0c90bfe39bde89f51bd2d55ec25b9624461b9d4c
tree1ad2770492b3073a7d5649ba3dfcc408f9697ff4
parent342af35ab8c755a903590cd6b3f17eacf90958c1
parent75378ded5ff36f034bb3ba2434fa43f824b4351b
Merge branch 'MDL-57972-master' of git://github.com/ryanwyllie/moodle