Merge branch 'MDL-59667-master-2' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 11:12:45 +0000 (13:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 11:12:45 +0000 (13:12 +0200)
commit245227fdcd0107f11e653fd47d1a690cff5145e4
tree71c9f632081fd2bcace12eed30a534cecc0e8030
parent9729cd2fcc81640c7ae085ee2750889a757ed608
parentecc88f337982355791229556f221bb879196599b
Merge branch 'MDL-59667-master-2' of git://github.com/ryanwyllie/moodle