Merge branch 'MDL-60858-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 10:34:47 +0000 (11:34 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 10:34:47 +0000 (11:34 +0100)
commit3bcf2d2895b20f993a20acfe5281e6040b9bf1e3
tree54c18aafdbdab037562c3765af3d38079e1c3112
parentf41e1773e9054ba1565fe0ffe6561e153145ce10
parente236dc144602e86e891c17408868afb13a3d6de7
Merge branch 'MDL-60858-master' of git://github.com/ryanwyllie/moodle