Merge branch 'MDL-57890-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 16:53:37 +0000 (17:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 16:53:37 +0000 (17:53 +0100)

Trivial merge