Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 05:10:33 +0000 (13:10 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 10 Jan 2011 05:10:33 +0000 (13:10 +0800)

Trivial merge