Merge branch 'MDL-55167-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 17:54:00 +0000 (19:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 17:54:00 +0000 (19:54 +0200)

Trivial merge