Merge branch 'MDL-41922-master-c' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 09:23:09 +0000 (11:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 09:23:09 +0000 (11:23 +0200)

Trivial merge