Merge branch 'MDL-61896-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commit1475e116dfefb3f51a6848681b7a40fcc0418596
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 21:55:14 +0000 (11 23:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 21:55:14 +0000 (11 23:55 +0200)
tree6f442a2c95d4c6c91f0a16494ec0c8ebc79a9fa3
parente0228935e42aefa92f8c06cbe703cbb771755d22
parent04de230de4b4b3cc2e3df51f76512cb127818b70
Merge branch 'MDL-61896-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE