Merge branch 'MDL-54657_m32v1' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 17:56:20 +0000 (19:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 17:56:20 +0000 (19:56 +0200)

Trivial merge