Merge branch 'MDL-45730_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 04:10:51 +0000 (12:10 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 16 Oct 2017 04:10:51 +0000 (12:10 +0800)
commit5be8c8daa6889dac474ac484ca4ff589081bb9f5
tree5f4f3f269a4fb3f0410d54c31cebfc0507a935a3
parent6b76e041f4ee4703bb4d63ba1559476aa221a45d
parenta475e0fe79c749d6b0d0364623c02e7d5be3eadd
Merge branch 'MDL-45730_master' of git://github.com/markn86/moodle