Merge branch 'MDL-49423-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2017 18:05:51 +0000 (19:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2017 18:05:51 +0000 (19:05 +0100)

Trivial merge