Merge branch 'MDL-43176' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 21:10:31 +0000 (23:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 21:10:31 +0000 (23:10 +0200)
commite98f05340d19b0dc6f3ac57eed1b6811d08674ad
treed70be2dfd1418ea9e8eedd9c1e500bae49fc664c
parent77b767c3621b4b63f5e43a7d138fe0b085d28a6f
parentdbe7012475b7ba80554e15b6167d1d43b3958b78
Merge branch 'MDL-43176' of https://github.com/NeillM/moodle