Merge branch 'MDL-59790-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Aug 2017 09:34:22 +0000 (11:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Aug 2017 09:34:22 +0000 (11:34 +0200)
commit8839739680cc6f526e87b2772c392e103c0ac34e
treebb9630206022b8e34faaaa05c4d00d5fc6f2f3b9
parentfc7467e5a1240325ec5188111566fa1cc1348a32
parentb45ca55d6b64cc0bc34dd73f0068a40da707f990
Merge branch 'MDL-59790-master' of git://github.com/lameze/moodle