Merge branch '45209-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 21:49:58 +0000 (23:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Jul 2014 21:49:58 +0000 (23:49 +0200)

Trivial merge