Merge branch '47684-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:02:03 +0000 (11:02 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Oct 2014 10:02:03 +0000 (11:02 +0100)

Trivial merge