Merge branch 'MDL-39060-33' of git://github.com/zig-moodle/moodle into MOODLE_33_STABLE
commit085f325851a7ac5042f54ffec2382359206e4885
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2018 11:45:53 +0000 (27 13:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2018 11:45:53 +0000 (27 13:45 +0200)
tree43168397a71fec1ed6002e9933b5d9cc06d7cebb
parent4d26291ddc1d84c6d8f774beb6c5fbd8cfaf3c02
parent1892dd565fd32f8dfb15c556162a727656527fad
Merge branch 'MDL-39060-33' of git://github.com/zig-moodle/moodle into MOODLE_33_STABLE