Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 21:03:06 +0000 (10:03 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 29 Sep 2014 21:03:06 +0000 (10:03 +1300)

Trivial merge