Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 11:01:24 +0000 (12:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 11:01:24 +0000 (12:01 +0100)

Trivial merge