Merge branch 'MDL-61860-34' of https://github.com/mackensen/moodle into MOODLE_34_STABLE
commit4d01802d310cd44b7a78ef9eff191efecfd20d6c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 23:01:07 +0000 (10 01:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Apr 2018 23:01:07 +0000 (10 01:01 +0200)
tree8d5e4d40d469660dc064b6b6ab0dac3ca9a90eb5
parent91513c6bd3a7a87aa52149e1e6b62343d22aee86
parent507867b76db6442de85dc7d641eeede86281e524
Merge branch 'MDL-61860-34' of https://github.com/mackensen/moodle into MOODLE_34_STABLE