Merge branch 'MDL-56345-master' of https://github.com/lucisgit/moodle
commit5dea1f12fc419bcb8e3fdee0a7b94648808d9f79
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 07:37:47 +0000 (18 09:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 07:37:47 +0000 (18 09:37 +0200)
tree04fc2b829eb1182725e6d6c2e29989efa19dbe69
parent51607c7ea307aebaaea04c567f5701dde224bcd3
parentc156b7b76dc6af2105e44256965748c994f88644
Merge branch 'MDL-56345-master' of https://github.com/lucisgit/moodle