Merge branch 'MDL-53795-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:44:46 +0000 (01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Apr 2016 23:44:46 +0000 (01:44 +0200)

Trivial merge