Merge branch 'MDL-55083_master' of https://github.com/tunele/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 22:09:08 +0000 (00:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 22:09:08 +0000 (00:09 +0200)

Trivial merge