Merge branch 'MDL-59106_master-fix' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 12 Oct 2017 02:54:25 +0000 (10:54 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 12 Oct 2017 02:54:25 +0000 (10:54 +0800)
commitcb9a803d802d86341cac3f41cf61ec79bea68138
tree16f199a27c3b3f35b8fd2c606cf932ec8c74eec1
parent0ce90263071a8e9584a8ec3711109d07b8f452db
parentce017edd2f7a2f10c0b8027424ded314ae8089c3
Merge branch 'MDL-59106_master-fix' of git://github.com/dmonllao/moodle