Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Nov 2017 05:49:47 +0000 (13:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Nov 2017 05:49:47 +0000 (13:49 +0800)
commit03561ea8992b66e2af9c556499e36d172f696cfe
treee1b0d120aaa1bb74310738320900c06107a7e7e6
parentb44bc9bf6c3bd3a9d368e0ec79495f215cb14a28
parent6688ae2ba20e93bed4b781650758b9630de215b1
Merge branch 'MDL-60062-master-2' of git://github.com/ryanwyllie/moodle