Merge branch 'MDL-54947' of https://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 3 Jul 2016 23:05:12 +0000 (01:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 3 Jul 2016 23:05:12 +0000 (01:05 +0200)

Trivial merge