Merge branch 'MDL-61081-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 23:27:38 +0000 (00:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 23:27:38 +0000 (00:27 +0100)
commit4fa58ece6239fbd5af199796d0cc77a18fdce109
tree373605f99c89fc5618b75fe3004251724b3bb78f
parent2b2cad6f0a0c951c9014828372e6ab9bd56880f6
parent19f06850694801fe67973030be3d356eff2c6c09
Merge branch 'MDL-61081-master' of git://github.com/sarjona/moodle