Merge branch 'MDL-43936' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 21:11:44 +0000 (10:11 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 3 Feb 2014 21:11:44 +0000 (10:11 +1300)

Trivial merge