Merge branch '45333-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jun 2014 14:25:59 +0000 (15:25 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Jun 2014 14:25:59 +0000 (15:25 +0100)

Trivial merge