Merge branch 'MDL-54656_m32v3' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:50:19 +0000 (00:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:50:19 +0000 (00:50 +0200)
commitbc7817edab21eea8acabd30df3bd14239b5ac8cf
tree7a163df125329da8c2a82df84a1b32429e815986
parenta9b1af901b1acf032b9daa1c7b79b225a11f544b
parent1e93eb58ce929a695af25fd0a6aac2515e447d2b
Merge branch 'MDL-54656_m32v3' of https://github.com/sbourget/moodle