Merge branch 'm28_MDL-46250' of https://github.com/totara/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Jul 2014 12:12:43 +0000 (13:12 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Jul 2014 12:12:43 +0000 (13:12 +0100)

Trivial merge