Merge branch '47752-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 15:31:24 +0000 (16:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:16 +0000 (11:48 +0200)

Trivial merge