Merge branch 'MDL-60092-master-fix2' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 12 Oct 2017 06:31:17 +0000 (14:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 12 Oct 2017 06:31:17 +0000 (14:31 +0800)
commit2962f0fa51d2178588dbbdd7722cd2e20e8b8943
tree268d7605891bf012d59a878b0b1215d9bba4789f
parentda419adfb040ab8d09e25e50ea3f79e6d44ed075
parent9adc10955e40701edcec12619e775796b80d443e
Merge branch 'MDL-60092-master-fix2' of git://github.com/lameze/moodle