Merge branch 'MDL-53660-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Apr 2016 23:19:58 +0000 (01:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Apr 2016 23:19:58 +0000 (01:19 +0200)

Trivial merge