Merge branch 'm28_MDL-46225' of https://github.com/totara/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 22:36:10 +0000 (10:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 7 Jul 2014 22:36:10 +0000 (10:36 +1200)

Trivial merge