Merge branch 'MDL-60342-33' of https://github.com/patkira/moodle into MOODLE_33_STABLE
commita5adcc8ad4c801351bfffca483d19f790eeed654
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 21:24:58 +0000 (19 23:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 19 Oct 2017 21:24:58 +0000 (19 23:24 +0200)
tree9beb26c0bf12fa423491398b8a99e45e15e5786b
parentc4cae28841fea74c928d8d4c413362e393c69333
parent74ee81e38e91e9a779b4b0227ce9f8fc5bec1f72
Merge branch 'MDL-60342-33' of https://github.com/patkira/moodle into MOODLE_33_STABLE