Merge branch 'MDL-61107' of git://github.com/timhunt/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 07:34:39 +0000 (08:34 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 07:34:39 +0000 (08:34 +0100)
commitb5e7264543ce18d4bad74254d3ad78df5d3434ff
tree4a722bba303cd40cba22f43434006dbda5e02337
parentdc61d1bea0831155c2d7f172870e0ccab033f742
parentd2e1aa76e145c2eade4a208296fe46be616eb71c
Merge branch 'MDL-61107' of git://github.com/timhunt/moodle