Merge branch 'MDL-58845-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE
commita6a174d8174cf4d0d07ebacd38898f44c3b237f4
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Feb 2018 01:12:48 +0000 (19 02:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Feb 2018 01:12:48 +0000 (19 02:12 +0100)
tree9d3a590aa27e707fd5c51f34eb79576c0a04e4c3
parentd0064b9d05dd8afdd15badb3c897f2a133cc45f7
parent5b1cfc900deba779cd95a64732f0558b53c90a32
Merge branch 'MDL-58845-34' of https://github.com/lucaboesch/moodle into MOODLE_34_STABLE