Merge branch '45724-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 08:07:16 +0000 (09:07 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 08:07:16 +0000 (09:07 +0100)

Trivial merge