Merge branch 'MDL-48259' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 21:49:54 +0000 (10:49 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 21:49:54 +0000 (10:49 +1300)

Trivial merge