Merge branch 'wip-MDL-46682-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2016 11:50:12 +0000 (13:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2016 11:50:12 +0000 (13:50 +0200)
commit9825afd76a84b83201cf2d8b426f8a401bf7ccea
tree11a558a72be82e2afc2dfdbd64de4cecd0252776
parent080c1e798b874190e66462a861c340206d78de6b
parent3261b9eeea2fcf5fc8117b9b08c1b08b69fb2878
Merge branch 'wip-MDL-46682-master' of git://github.com/abgreeve/moodle