Merge branch 'MDL-59657_master-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 6 Sep 2017 13:24:12 +0000 (14:24 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 7 Sep 2017 08:58:38 +0000 (10:58 +0200)
commit2999602b85208d97fad58b8a926f321da6309049
tree93ed42425f5b2e590d2f4f66e621b2a0f4032d47
parent95fc1e720ca49625c194883f1b802e7f878351fe
parent0a68e283d0606ea69a76e393bda4cbf5d4aae98d
Merge branch 'MDL-59657_master-fix' of git://github.com/dmonllao/moodle