Merge branch 'MDL-59270-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 01:58:37 +0000 (09:58 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 20 Jun 2017 01:58:37 +0000 (09:58 +0800)
commit65f1cac814c8a719385b72bbcac6837f3dc6492d
tree76a5b2281942ac02688b369517989da066aedc07
parent78013a17c7dc24529d9d4585d0490f3ad7c18a76
parent07782e10f12d5f6db4fa633fd697c9473e52bde7
Merge branch 'MDL-59270-master' of git://github.com/lameze/moodle