Merge branch 'MDL-47618' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 22:12:28 +0000 (11:12 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Nov 2014 22:12:28 +0000 (11:12 +1300)

Trivial merge