Merge branch 'MDL-53752-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 17:06:26 +0000 (19:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Oct 2016 17:06:26 +0000 (19:06 +0200)

Trivial merge