Merge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:27:12 +0000 (12:27 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:27:12 +0000 (12:27 +0800)
commit233c91e7d01462014147d86f49f90c9b30b91d59
tree4ef99ecea9ab6568e53ffa8fe6c8216cb4c56cc6
parent59be445c154dd70031ef3121016791389a923122
parentd55d2070444f3415d390e961dabc44bc13438526
Merge branch 'master_MDL-60979' of https://github.com/danmarsden/moodle