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

Trivial merge