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

Trivial merge