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

Trivial merge