Merge branch 'MDL-59668_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 06:22:01 +0000 (08:22 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 7 Aug 2017 06:22:01 +0000 (08:22 +0200)
commit68c406ffdda882e535082b5f2b4d8dc3413fe1d7
tree6e929d6a2f384475343c199421a77fd131ff64a1
parentc9d781d207dc29f18a27d888e0f81778461c3a9a
parent6d29cccf04583f696a7cc2fe0becfb53be976bb7
Merge branch 'MDL-59668_master' of git://github.com/markn86/moodle