Merge branch '48374-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Dec 2014 23:10:41 +0000 (00:10 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:04:09 +0000 (12:04 +0000)

Trivial merge