Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 20:42:46 +0000 (09:42 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 20:42:46 +0000 (09:42 +1300)

Trivial merge