Merge branch 'MDL-59936-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 30 Oct 2017 01:34:58 +0000 (14:34 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Oct 2017 01:34:58 +0000 (14:34 +1300)
commit391ea5b7de9f41e0eed4791d5de652ca09d06ffe
tree622feec5372c715f0e77373689c3b6da64d65296
parent9d0e1fca5a89271524dbc4f3538b9bfab2a5e7a2
parent8f730872a7bbe737d5a3f355337f8fe6daea3683
Merge branch 'MDL-59936-master' of git://github.com/andrewnicols/moodle