Merge branch 'MDL-53991_m33v4' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Feb 2017 17:12:39 +0000 (18:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Feb 2017 17:12:39 +0000 (18:12 +0100)
commitbad6e880b2772533f826df176bcae8faabcd3e20
treedb882925ff848cddb95cd35a6235a1c7bd058321
parentafd3eb9e1183bad4f10bb7d8f1619d3117e89df2
parentf8dad7374c2faed0415402e4c24bc6052ee0dc80
Merge branch 'MDL-53991_m33v4' of https://github.com/sbourget/moodle