Merge branch 'MDL-53430-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 23:03:31 +0000 (00:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Mar 2016 23:03:31 +0000 (00:03 +0100)

Trivial merge