Merge branch 'MDL-58835_master-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 13 Sep 2017 08:04:39 +0000 (09:04 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 13 Sep 2017 08:04:39 +0000 (09:04 +0100)
commitcf7430f07ca47ffbdf8a4fbbc65e068e2ecb5b9a
treec22d41731922c496149e1ede2f11637fb8da71d2
parent59f431e8a756183bc4194153c44d9749159f5fcb
parenta6edbef55695edb242e84fd6c97a07542166af66
Merge branch 'MDL-58835_master-fix' of git://github.com/dmonllao/moodle