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

Trivial merge