Merge branch 'MDL-53323' of https://github.com/mr-russ/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 18:43:26 +0000 (19:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 18:43:26 +0000 (19:43 +0100)

Trivial merge