Merge branch 'MDL-60352-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 08:16:34 +0000 (16:16 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 5 Oct 2017 08:16:34 +0000 (16:16 +0800)
commit736b368920d55c38fcc02a93a175eefa3206ffbd
tree7a9cbe9833edef9cadf9fca7a8911987501a813b
parent1afd3c72aa0a6bcc665edbaea51e87b22dc0bdfe
parent1df40a2dce38d1c666d453f6ceb477d5c58ed019
Merge branch 'MDL-60352-master' of git://github.com/andrewnicols/moodle