Merge branch 'MDL-58744-master' of https://github.com/jacac/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 06:36:18 +0000 (08:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 06:36:18 +0000 (08:36 +0200)
commit634d0f8330e5dc8bf804149a5c20555beb94aab5
treefd9a8a66e9aa75f19db33f8839bb5c591af3452b
parent2653e0c8e129957ace07693ef9848554c8509b32
parentd674f12b7c3b004ece2445910f1dc04a5fe4316e
Merge branch 'MDL-58744-master' of https://github.com/jacac/moodle