Merge branch '38343-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Nov 2014 23:26:41 +0000 (00:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Nov 2014 23:26:41 +0000 (00:26 +0100)

Trivial merge