Merge branch '46481-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 13:25:06 +0000 (14:25 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 7 Oct 2014 13:25:06 +0000 (14:25 +0100)

Trivial merge