Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle
commitc405d31bef61305da840b334d2af84a4ef45e528
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 18:24:13 +0000 (11 20:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Oct 2016 17:32:05 +0000 (13 19:32 +0200)
tree8ca5e31d75ca387392025101e09378fa5c4232d9
parent403b817857e151014f5f4f5b36dd9f09b56b418e
parent4582da24648e11ea54f86e1f07245853780ba099
Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle