Merge branch 'MDL-55134-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 00:53:58 +0000 (02:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 00:53:58 +0000 (02:53 +0200)

Trivial merge