Merge branch 'MDL-59859-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:36:48 +0000 (12:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Aug 2017 10:36:48 +0000 (12:36 +0200)
commitfae154ea393a1ad12e49c06363fd33857b3e0a31
tree2b873e1854befa00aad5a7bcde5974f8919c5f8c
parentfaa509dfb26499f4b069b864aee105de3ffb6515
parentb05f2cd7945d1b42cf4bddce31163e698d7181f3
Merge branch 'MDL-59859-master' of git://github.com/andrewnicols/moodle