Merge branch 'MDL-55236' of https://github.com/bostelm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 18:30:49 +0000 (20:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 18:30:49 +0000 (20:30 +0200)

Trivial merge