Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 14 Nov 2017 08:40:59 +0000 (16:40 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 14 Nov 2017 08:40:59 +0000 (16:40 +0800)
commitaece25138f6455dbcf5319881314cf7837e68463
treed56289db4ceb8354d48e40a8d158b06d8fb788ad
parent55b2742724009c8725cd410658645f64314612a8
parent3420d3076245ef766055f587e3fc8c0201bfd9f5
Merge branch 'MDL-60675-master' of git://github.com/mihailges/moodle