Merge branch '42609-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jul 2014 18:31:25 +0000 (20:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jul 2014 18:31:25 +0000 (20:31 +0200)

Trivial merge