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

Trivial merge