Merge branch 'MDL-61077' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 01:26:04 +0000 (02:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jan 2018 01:26:04 +0000 (02:26 +0100)
commita610100586733bc06f046f0882acf479d482ab1f
tree10b3d080e34166f2722d57785159e1738a6936bf
parentdf4e047944267412e707eafdbdb071bdd88dd946
parentbccad386b0ff0dacfc6c4e8712f73a1ac8fd60fd
Merge branch 'MDL-61077' of git://github.com/timhunt/moodle