Merge branch 'm28_MDL-46144' of https://github.com/totara/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:10:30 +0000 (13:10 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Jul 2014 01:10:30 +0000 (13:10 +1200)

Trivial merge