Merge branch 'MDL-57455' of https://github.com/stronk7/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 17:33:37 +0000 (19:33 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 16 Oct 2017 17:33:37 +0000 (19:33 +0200)
commit23e5b74954b66a822fa667fee939f0c06bce055f
tree9f2e13353364d9a20bedd746b715f0c01d1b8e1b
parent7f1f78d23ec85d5144cff847115eb29f185940a4
parent76feb5ac9b4242b57475c5ab072a08e79bbda758
Merge branch 'MDL-57455' of https://github.com/stronk7/moodle