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

Trivial merge