Merge branch 'MDL-59867-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 05:10:46 +0000 (07:10 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 05:10:46 +0000 (07:10 +0200)
commit2cef0d3ade696b6a9ebbff0d3162d74d770af626
tree788290371ab03a5bcf688f21aee56bc3976272cc
parentfb6ff3c5533fd179f1900fe0422ce9380511b107
parentb7df2485e6db1887aeeacf8a31871e100270de8b
Merge branch 'MDL-59867-master' of git://github.com/damyon/moodle