Merge branch 'MDL-23425' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:12:50 +0000 (16:12 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 08:12:50 +0000 (16:12 +0800)

Trivial merge