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

Trivial merge