Merge branch '48189-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Nov 2014 10:18:16 +0000 (11:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Nov 2014 10:18:16 +0000 (11:18 +0100)

Trivial merge