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

Trivial merge