Merge branch 'MDL-60570-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Sun, 29 Oct 2017 22:00:44 +0000 (11:00 +1300)
committerJun Pataleta <jun@moodle.com>
Sun, 29 Oct 2017 22:00:44 +0000 (11:00 +1300)
commite905b656f53092be9164debb97eaecc5d7720432
tree65ab2c21acd156e8edfac8e60b9c1eb97b00af47
parent526d354991c433d1d73b4694ca7ee7a9c65c6c4e
parenteb3b38f04c34a9a64181310336d4d507e6537c8d
Merge branch 'MDL-60570-master' of git://github.com/andrewnicols/moodle