Merge branch 'MDL-61521-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
commit94f42309c59f735af6f67e434b9b019ef1d6cad2
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 May 2018 23:45:44 +0000 (8 01:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 May 2018 23:45:44 +0000 (8 01:45 +0200)
treeece41fb82b6a508748814d2ac620de593b4a7149
parent5fd78d27ae3e7e504de7c7ec080aadeb18d87ae8
parenta760d1a27885098114806737c094908de07a4024
Merge branch 'MDL-61521-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE