Merge branch 'MDL-54769-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 21:56:25 +0000 (23:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 21:56:25 +0000 (23:56 +0200)

Trivial merge