Merge branch 'MDL-53043' of https://github.com/andrewhancox/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Apr 2016 22:53:07 +0000 (00:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Apr 2016 22:53:07 +0000 (00:53 +0200)

Trivial merge