Merge branch 'MDL-60733-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 11:03:43 +0000 (12:03 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 8 Nov 2017 11:03:43 +0000 (12:03 +0100)
commit6463a047a2a5901597806e5ed1907def2445f26f
tree5aa414266ecc1312fc5ae0d8083584024c11f558
parentccf7578373718da40162b6c64e86be77d8f6f333
parentd3882ea4a398d254b70ccdaf6e4c5151150883c9
Merge branch 'MDL-60733-master' of git://github.com/damyon/moodle