Merge branch 'MDL-60545_master' of git://github.com/markn86/moodle
commitc00e73dfe056295a5e8e3f037b0d4ff671b13c35
authorJake Dallimore <jake@moodle.com>
Tue, 24 Oct 2017 06:25:01 +0000 (24 14:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Oct 2017 04:45:52 +0000 (25 12:45 +0800)
tree535846de639d26685d26544def13eb8ba60711a0
parentbbb9e171332eb3e335c433e022fb6070753b9866
parent05ce018002469584b87babaa0db65e4d0e5c485c
Merge branch 'MDL-60545_master' of git://github.com/markn86/moodle