Merge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 13 Dec 2017 03:30:46 +0000 (11:30 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 13 Dec 2017 03:30:46 +0000 (11:30 +0800)
commit23611c375777995f724862821d78d83529fe18fc
treef4d6e6973182655a97d0e4a210324161e3dbd280
parent4ea790da9ba5d7fa976de2f3f58142ac608bc82c
parent08a79155511be3e2f1c223e6659588d6fd80ad77
Merge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle