Merge branch 'MDL-52511-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 01:00:37 +0000 (02:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Feb 2016 01:00:37 +0000 (02:00 +0100)

Trivial merge