Merge branch 'MDL-60132-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 20:34:39 +0000 (22:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 20:34:39 +0000 (22:34 +0200)
commit77b767c3621b4b63f5e43a7d138fe0b085d28a6f
tree09e7fabe0e6d4c3d64aeb44f6e61e4d0f87e8341
parentbe5d95fc74a2a87174afec0989d531c1f73984a8
parent6703e031f0f3d09bafffc5676ccbc8c31d3d8b34
Merge branch 'MDL-60132-master' of git://github.com/jleyva/moodle