Merge branch 'MDL-37378' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:43:08 +0000 (10:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 14 Jan 2013 21:43:08 +0000 (10:43 +1300)

Trivial merge