Merge branch 'MDL-54800-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 19:10:28 +0000 (21:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 19:10:28 +0000 (21:10 +0200)
commit8a8e436cf7849b5983afb1dd2fce88b46733b740
tree2ca07dbd1a9f5cdcb4cc867fb51dd3c7c26f3335
parent6880e350d3f0ca5995ca7cdaf241fa1ea74ff9b5
parent27c7ed0b2e6258bdf4c69338cce4845e8b852503
Merge branch 'MDL-54800-master' of git://github.com/jleyva/moodle