Merge branch 'MDL-59938-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Oct 2017 22:22:30 +0000 (11:22 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Oct 2017 22:22:30 +0000 (11:22 +1300)
commit75909e3c925c5724a26d3b972408f7b50d9be8bc
treeb69dbc530a07d33fa63a9b09ec93f940a9067c74
parent2a1f7a444225e80cea6471a5019af128b5b8c209
parentacd146fe7c6eeb5afe47b8cd0b4daa3070a15360
Merge branch 'MDL-59938-master' of git://github.com/andrewnicols/moodle