Merge branch 'MDL-60264-master' of git://github.com/jleyva/moodle
commit1258a59126e15f59daf6554754b603e30b4ce719
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Oct 2017 21:06:17 +0000 (4 23:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Oct 2017 21:06:17 +0000 (4 23:06 +0200)
tree2fdc2ceabd114e8238799f9ff6ffe2d64b52eeb6
parentb6f370112d4b8696b54b62430a57d9a9228795d0
parent41447216ea399e876101838e54970c8db2a1764a
Merge branch 'MDL-60264-master' of git://github.com/jleyva/moodle