Merge branch 'mdl-53133-master' of git://github.com/deraadt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 22:52:19 +0000 (23:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 22:52:19 +0000 (23:52 +0100)

Trivial merge