Merge branch 'MDL-62371-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commitd567be0d04e13269bf049e412ee2a740e2d89118
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 00:42:27 +0000 (14 02:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 May 2018 00:42:27 +0000 (14 02:42 +0200)
tree9c47f266f65c64fee6e83bb5c609482743e2a299
parent98900443b70bd8572733098cd2cd5ac9a3661636
parent6d86e2d223760a7e733daca360f38e8ab2055046
Merge branch 'MDL-62371-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE