Merge branch 'MDL-53139' of https://github.com/dg711/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 23:12:18 +0000 (00:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 23:12:18 +0000 (00:12 +0100)

Trivial merge