Merge branch 'MDL-61576-34' of git://github.com/cescobedo/moodle into MOODLE_34_STABLE
commitf0a2fb7e2f9a1accc4b8ed109cd5ed8a0526d8d3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Mar 2018 21:26:21 +0000 (26 23:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Mar 2018 21:26:21 +0000 (26 23:26 +0200)
treeba49b11dbf41bc48b8852f454cfe20f5fe44e02b
parentd7e920d8dd60d9f0177ccba89f0c3e277f349fa5
parent5499f63d46355d7f97a04c3c7cda673d4fb10d7a
Merge branch 'MDL-61576-34' of git://github.com/cescobedo/moodle into MOODLE_34_STABLE