Merge branch 'MDL-60364' of https://github.com/NeillM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:00:13 +0000 (01:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Oct 2017 23:00:13 +0000 (01:00 +0200)
commit559d5c38945bce9018a773d4fbd35950a5496625
tree13121a52c7982fb76b9bf8518288d88c6d0f204a
parentf8a86c157d7ccdc817d62e20c623b11b7fb7c412
parentcd2115fa3757fa7b6fc9e723d33e1dd56da90371
Merge branch 'MDL-60364' of https://github.com/NeillM/moodle