Merge branch 'MDL-25884' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:20:22 +0000 (10:20 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 02:20:22 +0000 (10:20 +0800)

Trivial merge