Merge branch 'MDL-56166-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2016 22:41:00 +0000 (00:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Oct 2016 22:41:00 +0000 (00:41 +0200)

Trivial merge