Merge branch 'MDL-60302-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 19:14:54 +0000 (21:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Oct 2017 19:14:54 +0000 (21:14 +0200)
commita9d3910d709c9bf18cf982bcf65b2880bfbe558f
treecaaa1e8ae5e7ad1a6119fe235fe0889ed61fa252
parente9802809f44a8c31a41004865ba25a1333c7974f
parente348f6a541e0a4652fdcd05fb4623036014e4fed
Merge branch 'MDL-60302-master' of git://github.com/jleyva/moodle