Merge branch 'MDL-23887-34-2' of https://github.com/snake/moodle into MOODLE_34_STABLE
commitc29b6e8c156bb55d79143cf96bbda11d93bd8892
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jan 2018 23:24:59 +0000 (3 00:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jan 2018 23:24:59 +0000 (3 00:24 +0100)
treedecbe238f190fa22616c575527cfb24718dd336f
parentff710b83c3d3397137786eea51642180f5683df9
parentc619279f5e56cb74f00b239cb90bd9eda97f0d07
Merge branch 'MDL-23887-34-2' of https://github.com/snake/moodle into MOODLE_34_STABLE