Merge branch 'MDL-61896-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
commit89e4561e94016ad13be5f4c5044eb215dd3b7416
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 21:54:55 +0000 (11 23:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Apr 2018 21:54:55 +0000 (11 23:54 +0200)
tree8a1aa31041cca4bdf17c97a9b18f5f0f8b6797ae
parent92c7a3b3c528b320d730d558e53ae2d172ef9361
parentf42a8992687c4f909c1656e6d4718a00aa9be033
Merge branch 'MDL-61896-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE