Merge branch 'MDL-39971' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 03:09:43 +0000 (15:09 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jun 2013 03:09:43 +0000 (15:09 +1200)

Trivial merge