Merge branch 'MDL-56022_m32v3' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 22:07:17 +0000 (00:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 22:07:17 +0000 (00:07 +0200)
commita14edb9fbb70b09918810ddd831185f23f081e75
tree6863c7a3299b29d7054146a30287c5b387341400
parent682074fe5b88835053c8b9d3d397195a5e3a5825
parent1b467cb8cf2ee714ccae8a403976ee271a321383
Merge branch 'MDL-56022_m32v3' of https://github.com/sbourget/moodle