Merge branch 'MDL-53642-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Apr 2016 20:39:26 +0000 (22:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Apr 2016 20:39:26 +0000 (22:39 +0200)

Trivial merge