Merge branch 'MDL-60628-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 9 Nov 2017 04:08:46 +0000 (17:08 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 9 Nov 2017 04:08:46 +0000 (17:08 +1300)
commit7a571b813aed5d33a40e481b2d159cfad319bca5
treea9b16b4efe7bb9c018a05955a2f24cdda6a906d6
parent5518a32de5598d906e08f81e2d96229471824b1c
parent754016ab33f874ac9c128b26f27f7860b294e4dc
Merge branch 'MDL-60628-master' of git://github.com/lameze/moodle