Merge branch 'MDL-55809-master' of https://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 19:05:15 +0000 (20:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 19:05:15 +0000 (20:05 +0100)
commit62968038780f3df71e24bfe8ce35d3ace759ab73
tree13931f1ba7957392a42c8a17b400df6d23554b36
parenta7471c40b481b4dadefc136d6dacbeebdae87ad9
parentb14319185509393ffec3b8a88616a50084aac7ee
Merge branch 'MDL-55809-master' of https://github.com/xow/moodle