Merge branch 'MDL-52983' of git://github.com/aolley/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 12:05:30 +0000 (13:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 12:05:30 +0000 (13:05 +0100)

Trivial merge