Merge branch '47969-28' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Nov 2014 00:56:59 +0000 (01:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Nov 2014 00:56:59 +0000 (01:56 +0100)

Trivial merge