Merge branch 'MDL-58970-master' of https://github.com/abias/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 20:27:52 +0000 (22:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 20:27:52 +0000 (22:27 +0200)
commitf3f4c142fc2b25d19df022fbd97a091bdf000726
tree7b40a08dbad175d46af78d185876fa9f2ad1f81c
parent10cd2bfad3741526ec7f0cdd7aaaa0a97f187603
parent79675c05d04b5ac295081e4d76fee3af49f97d1c
Merge branch 'MDL-58970-master' of https://github.com/abias/moodle