Merge branch 'MDL-59753-master' of git://github.com/lameze/moodle
commit423eca98d3aafec0c4ff9875d692f4110b6be0e6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Sep 2017 11:28:53 +0000 (5 13:28 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:53:32 +0000 (7 10:53 +0200)
treeeb56d4dffa5e794241efe0c00a1dfd724ee6d8e3
parent0e0e92c5e003ca7003b02ce5f6dacd482cb71c13
parentafa8c3daf1a555909b36b07c65c133d49473554d
Merge branch 'MDL-59753-master' of git://github.com/lameze/moodle