Merge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle
commita34a305d5310458847b6c82786b1b160132b5961
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:49:46 +0000 (12 12:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 04:49:46 +0000 (12 12:49 +0800)
tree77ca3e4ab4094a09087788527342de12a2cb3509
parenta576da555eaf10d2619ab3116666749f06db77bf
parent970dc511e2b749026a92a0e84732d4f1c36272d0
Merge branch 'MDL-44660-master' of https://github.com/lucaboesch/moodle