Merge branch 'MDL-61397-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commiteb12fec156ade8336672b07f770bb2a3817b9378
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 16:31:35 +0000 (12 17:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 16:31:35 +0000 (12 17:31 +0100)
tree8340bd23e00146011f3f34ef549fc3c912e54198
parentd2c04300f3720782bdddd46f239e3e59dbbc0238
parentf27cf98517c51cc4005beacc336350d85fe0e611
Merge branch 'MDL-61397-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE