Merge branch 'MDL-54795_master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:10:33 +0000 (20:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 18:10:33 +0000 (20:10 +0200)

Trivial merge