Merge branch '46335-28' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 08:59:04 +0000 (09:59 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jul 2014 08:59:04 +0000 (09:59 +0100)

Trivial merge