Merge branch 'MDL-54900-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 16:53:23 +0000 (18:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 16:53:23 +0000 (18:53 +0200)

Trivial merge