Merge branch '46208-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jul 2014 00:13:35 +0000 (02:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Jul 2014 00:13:35 +0000 (02:13 +0200)

Trivial merge