Merge branch '23178-29' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Dec 2014 23:06:46 +0000 (00:06 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 12:14:28 +0000 (12:14 +0000)

Trivial merge