Merge branch 'MDL-48382' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 00:58:13 +0000 (13:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 1 Dec 2014 00:58:13 +0000 (13:58 +1300)

Trivial merge