Merge branch 'MDL-62448-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE
commit1b70269f4ee9a91a543a61353607cd94ecf69cdc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 15:29:24 +0000 (15 17:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 15:29:24 +0000 (15 17:29 +0200)
tree6d19d657ea4b65fa0fde943fad02ca82af4be8e9
parentd60618cbea8b70d4059e21f906e9a5fb645fe263
parent8197937d222d007a4bd3cb11785b4760ca7d0d6d
Merge branch 'MDL-62448-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE