Merge branch 'MDL-61312-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE
commited154400cdfaebd9c7cdf98e113c55122e8a091f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2018 23:49:41 +0000 (7 00:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2018 23:49:41 +0000 (7 00:49 +0100)
tree87ca16e2a790a01d7d60018e86aed05468fef252
parent21f3353471510603d41e298761193cf0032751c8
parent444b165c09afdb2e7cb7db304019216955144b91
Merge branch 'MDL-61312-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE