Merge branch 'MDL-60139' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 01:14:32 +0000 (09:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 31 Oct 2017 01:14:32 +0000 (09:14 +0800)
commit3e4de6260708c7c1f657cf349edb6229f64ac284
treec15bec2c20f29ae5400ff2e27f07e104b3220c07
parentaba60237cdb64348e4ccfdab228a0a144f8c5d53
parent284c795d23af333b777f51c441bab825d64d63cf
Merge branch 'MDL-60139' of git://github.com/timhunt/moodle