Merge branch 'MDL-58435' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 14:35:12 +0000 (16:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 14:35:12 +0000 (16:35 +0200)
commitddea9878125fd37fb0b9530de35462a707f35374
treee69c5872612dbe07f533ea266f3dc25cd7cb8378
parent19e8e56e7eea0ed7e9d6188eb3d0b3cd84aa07fb
parent156a0a1560ec7d8a734300e07e071a0c4918e924
Merge branch 'MDL-58435' of https://github.com/NeillM/moodle